rubic-sdk 5.42.0-alpha.oneinch.2 → 5.42.0-alpha.oneinch.20

package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.d.ts

@@ -13,6 +13,7 @@ import { AcrossCrossChainProvider } from '../providers/across-provider/across-cr
 import { EddyBridgeProvider } from '../providers/eddy-bridge/eddy-bridge-provider';
 import { LayerZeroBridgeProvider } from '../providers/layerzero-bridge/layerzero-bridge-provider';
 import { MesonCrossChainProvider } from '../providers/meson-provider/meson-cross-chain-provider';
+import { OneinchCcrProvider } from '../providers/oneinch-provider/oneinch-ccr-provider';
 import { OrbiterBridgeProvider } from '../providers/orbiter-bridge/orbiter-bridge-provider';
 import { OwlToBridgeProvider } from '../providers/owl-to-bridge/owl-to-bridge-provider';
 import { RangoCrossChainProvider } from '../providers/rango-provider/rango-cross-chain-provider';
@@ -20,4 +21,4 @@ import { RetroBridgeProvider } from '../providers/retro-bridge/retro-bridge-prov
 import { RouterCrossChainProvider } from '../providers/router-provider/router-cross-chain-provider';
 import { StargateV2CrossChainProvider } from '../providers/stargate-v2-provider/stargate-v2-cross-chain-provider';
 import { TaikoBridgeProvider } from '../providers/taiko-bridge/taiko-bridge-provider';
-export declare const CrossChainProviders: readonly [typeof SymbiosisCrossChainProvider, typeof StargateV2CrossChainProvider, typeof XyCrossChainProvider, typeof CbridgeCrossChainProvider, typeof LifiCrossChainProvider, typeof SquidrouterCrossChainProvider, typeof RangoCrossChainProvider, typeof PulseChainCrossChainProvider, typeof OrbiterBridgeProvider, typeof ArchonBridgeProvider, typeof MesonCrossChainProvider, typeof OwlToBridgeProvider, typeof EddyBridgeProvider, typeof RouterCrossChainProvider, typeof RetroBridgeProvider, typeof AcrossCrossChainProvider, typeof DebridgeCrossChainProvider, typeof BridgersCrossChainProvider, typeof ChangenowCrossChainProvider, typeof ArbitrumRbcBridgeProvider, typeof TaikoBridgeProvider, typeof LayerZeroBridgeProvider];
+export declare const CrossChainProviders: readonly [typeof SymbiosisCrossChainProvider, typeof StargateV2CrossChainProvider, typeof XyCrossChainProvider, typeof CbridgeCrossChainProvider, typeof LifiCrossChainProvider, typeof SquidrouterCrossChainProvider, typeof RangoCrossChainProvider, typeof PulseChainCrossChainProvider, typeof OrbiterBridgeProvider, typeof ArchonBridgeProvider, typeof MesonCrossChainProvider, typeof OwlToBridgeProvider, typeof EddyBridgeProvider, typeof RouterCrossChainProvider, typeof RetroBridgeProvider, typeof AcrossCrossChainProvider, typeof OneinchCcrProvider, typeof DebridgeCrossChainProvider, typeof BridgersCrossChainProvider, typeof ChangenowCrossChainProvider, typeof ArbitrumRbcBridgeProvider, typeof TaikoBridgeProvider, typeof LayerZeroBridgeProvider];

package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js

@@ -17,6 +17,7 @@ const across_cross_chain_provider_1 = require("../providers/across-provider/acro
 const eddy_bridge_provider_1 = require("../providers/eddy-bridge/eddy-bridge-provider");
 const layerzero_bridge_provider_1 = require("../providers/layerzero-bridge/layerzero-bridge-provider");
 const meson_cross_chain_provider_1 = require("../providers/meson-provider/meson-cross-chain-provider");
+const oneinch_ccr_provider_1 = require("../providers/oneinch-provider/oneinch-ccr-provider");
 const orbiter_bridge_provider_1 = require("../providers/orbiter-bridge/orbiter-bridge-provider");
 const owl_to_bridge_provider_1 = require("../providers/owl-to-bridge/owl-to-bridge-provider");
 const rango_cross_chain_provider_1 = require("../providers/rango-provider/rango-cross-chain-provider");
@@ -41,7 +42,8 @@ const proxyProviders = [
     eddy_bridge_provider_1.EddyBridgeProvider,
     router_cross_chain_provider_1.RouterCrossChainProvider,
     retro_bridge_provider_1.RetroBridgeProvider,
-    across_cross_chain_provider_1.AcrossCrossChainProvider
+    across_cross_chain_provider_1.AcrossCrossChainProvider,
+    oneinch_ccr_provider_1.OneinchCcrProvider
 ];
 const nonProxyProviders = [
     debridge_cross_chain_provider_1.DebridgeCrossChainProvider,

package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"cross-chain-providers.js","sourceRoot":"","sources":["../../../../../src/features/cross-chain/calculation-manager/constants/cross-chain-providers.ts"],"names":[],"mappings":";;;AAAA,0JAAoJ;AACpJ,wIAAmI;AACnI,0JAAoJ;AACpJ,8IAAwI;AACxI,6JAAuJ;AACvJ,0JAAoJ;AACpJ,8IAAwI;AACxI,iKAA0J;AAC1J,sIAAsI;AACtI,mKAA6J;AAC7J,6JAAuJ;AACvJ,wIAAkI;AAElI,0GAAoG;AACpG,wFAAmF;AACnF,uGAAkG;AAClG,uGAAiG;AACjG,iGAA4F;AAC5F,8FAAwF;AACxF,uGAAiG;AACjG,2FAAsF;AACtF,0GAAoG;AACpG,yHAAkH;AAClH,6GAA6G;AAC7G,2FAAsF;AAEtF,MAAM,cAAc,GAAG;IACnB,4DAA2B;IAC3B,+DAA4B;IAC5B,8CAAoB;IACpB,wDAAyB;IACzB,kDAAsB;IACtB,gEAA6B;IAC7B,oDAAuB;IACvB,+DAA4B;IAC5B,+CAAqB;IACrB,6CAAoB;IACpB,oDAAuB;IACvB,4CAAmB;IACnB,yCAAkB;IAClB,sDAAwB;IACxB,2CAAmB;IACnB,sDAAwB;CAClB,CAAC;AAEX,MAAM,iBAAiB,GAAG;IACtB,0DAA0B;IAC1B,0DAA0B;IAC1B,4DAA2B;IAC3B,wDAAyB;IACzB,2CAAmB;IACnB,mDAAuB;IACvB,uBAAuB;CACjB,CAAC;AAEE,QAAA,mBAAmB,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,iBAAiB,CAAU,CAAC"}
+{"version":3,"file":"cross-chain-providers.js","sourceRoot":"","sources":["../../../../../src/features/cross-chain/calculation-manager/constants/cross-chain-providers.ts"],"names":[],"mappings":";;;AAAA,0JAAoJ;AACpJ,wIAAmI;AACnI,0JAAoJ;AACpJ,8IAAwI;AACxI,6JAAuJ;AACvJ,0JAAoJ;AACpJ,8IAAwI;AACxI,iKAA0J;AAC1J,sIAAsI;AACtI,mKAA6J;AAC7J,6JAAuJ;AACvJ,wIAAkI;AAElI,0GAAoG;AACpG,wFAAmF;AACnF,uGAAkG;AAClG,uGAAiG;AACjG,6FAAwF;AACxF,iGAA4F;AAC5F,8FAAwF;AACxF,uGAAiG;AACjG,2FAAsF;AACtF,0GAAoG;AACpG,yHAAkH;AAClH,6GAA6G;AAC7G,2FAAsF;AAEtF,MAAM,cAAc,GAAG;IACnB,4DAA2B;IAC3B,+DAA4B;IAC5B,8CAAoB;IACpB,wDAAyB;IACzB,kDAAsB;IACtB,gEAA6B;IAC7B,oDAAuB;IACvB,+DAA4B;IAC5B,+CAAqB;IACrB,6CAAoB;IACpB,oDAAuB;IACvB,4CAAmB;IACnB,yCAAkB;IAClB,sDAAwB;IACxB,2CAAmB;IACnB,sDAAwB;IACxB,yCAAkB;CACZ,CAAC;AAEX,MAAM,iBAAiB,GAAG;IACtB,0DAA0B;IAC1B,0DAA0B;IAC1B,4DAA2B;IAC3B,wDAAyB;IACzB,2CAAmB;IACnB,mDAAuB;IACvB,uBAAuB;CACjB,CAAC;AAEE,QAAA,mBAAmB,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,iBAAiB,CAAU,CAAC"}

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.d.ts

@@ -1,2 +1,2 @@
-export declare const oneinchCcrSupportedChains: readonly ["ETH", "OPTIMISM", "BASE", "BSC", "POLYGON", "GNOSIS", "AVALANCHE", "FANTOM", "KLAYTN", "AURORA"];
+export declare const oneinchCcrSupportedChains: readonly ["ETH", "OPTIMISM", "BASE", "ARBITRUM", "BSC", "POLYGON", "GNOSIS", "AVALANCHE", "FANTOM", "KLAYTN", "AURORA"];
 export type OneinchCcrSupportedChain = (typeof oneinchCcrSupportedChains)[number];

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.js

@@ -7,6 +7,7 @@ exports.oneinchCcrSupportedChains = [
     blockchain_name_1.BLOCKCHAIN_NAME.OPTIMISM,
     // BLOCKCHAIN_NAME.ZK_SYNC, // currently fusion+ doesnt't support zkSync
     blockchain_name_1.BLOCKCHAIN_NAME.BASE,
+    blockchain_name_1.BLOCKCHAIN_NAME.ARBITRUM,
     blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN,
     blockchain_name_1.BLOCKCHAIN_NAME.POLYGON,
     blockchain_name_1.BLOCKCHAIN_NAME.GNOSIS,

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneinch-ccr-supported-chains.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,yBAAyB,GAAG;IACrC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,QAAQ;IACxB,wEAAwE;IACxE,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,SAAS;IACzB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,MAAM;CAChB,CAAC"}
+{"version":3,"file":"oneinch-ccr-supported-chains.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,yBAAyB,GAAG;IACrC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,QAAQ;IACxB,wEAAwE;IACxE,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,SAAS;IACzB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,MAAM;CAChB,CAAC"}

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

@@ -1,5 +1,10 @@
 import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
 import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
+export type OneinchResp<T> = T | {
+    description: string;
+    error: string;
+    statusCode: number;
+};
 export interface OneinchQuoteParams {
     srcToken: PriceTokenAmount<EvmBlockchainName>;
     dstToken: PriceToken<EvmBlockchainName>;
@@ -82,4 +87,8 @@ export interface OneinchReadySecretsResponse {
         dstEscrowDeployTxHash: string;
     }>;
 }
+export interface OneinchSecret {
+    secret: string;
+    hashedSecret: string;
+}
 export {};

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/models/oneinch-ccr-trade-types.d.ts

@@ -18,11 +18,3 @@ export interface OneinchCcrTradeParams {
     routePath: RubicStep[];
     useProxy: boolean;
 }
-export interface OneinchGetGasDataParams {
-    from: PriceTokenAmount<EvmBlockchainName>;
-    toToken: PriceTokenAmount<EvmBlockchainName>;
-    feeInfo: FeeInfo;
-    providerAddress: string;
-    quote: OneinchCcrQuoteResponse;
-    slippage: number;
-}

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.d.ts

@@ -3,10 +3,13 @@ import { BlockchainName, EvmBlockchainName } from '../../../../../core/blockchai
 import { RequiredCrossChainOptions } from '../../models/cross-chain-options';
 import { CrossChainProvider } from '../common/cross-chain-provider';
 import { CalculationResult } from '../common/models/calculation-result';
+import { FeeInfo } from '../common/models/fee-info';
 import { RubicStep } from '../common/models/rubicStep';
+import { OneinchCcrSupportedChain } from './constants/oneinch-ccr-supported-chains';
 export declare class OneinchCcrProvider extends CrossChainProvider {
     readonly type: "oneinch";
     isSupportedBlockchain(fromBlockchain: BlockchainName): boolean;
     calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions): Promise<CalculationResult>;
+    protected getFeeInfo(fromBlockchain: OneinchCcrSupportedChain, providerAddress: string, percentFeeToken: PriceTokenAmount, useProxy: boolean): Promise<FeeInfo>;
     protected getRoutePath(fromToken: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>): Promise<RubicStep[]>;
 }

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js

@@ -5,10 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OneinchCcrProvider = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const errors_1 = require("../../../../../common/errors");
 const tokens_1 = require("../../../../../common/tokens");
 const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
 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 oneinch_ccr_supported_chains_1 = require("./constants/oneinch-ccr-supported-chains");
 const oneinch_ccr_trade_1 = require("./oneinch-ccr-trade");
 const oneinch_ccr_api_service_1 = require("./services/oneinch-ccr-api-service");
@@ -26,6 +28,8 @@ class OneinchCcrProvider extends cross_chain_provider_1.CrossChainProvider {
         const useProxy = false;
         const walletAddress = options.fromAddress || this.getWalletAddress(fromBlockchain);
         try {
+            if (from.isNative)
+                throw new errors_1.NotSupportedTokensError();
             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 quote = await oneinch_ccr_api_service_1.OneinchCcrApiService.fetchQuote({
@@ -37,15 +41,12 @@ class OneinchCcrProvider extends cross_chain_provider_1.CrossChainProvider {
                 ...toToken.asStruct,
                 weiAmount: new bignumber_js_1.default(quote.dstTokenAmount)
             });
+            const gasInfo = quote.presets[quote.recommendedPreset].gasCost;
             const gasData = options.gasCalculation === 'enabled'
-                ? await oneinch_ccr_trade_1.OneinchCcrTrade.getGasData({
-                    from: fromWithoutFee,
-                    feeInfo,
-                    toToken: to,
-                    providerAddress: options.providerAddress,
-                    quote,
-                    slippage: options.slippageTolerance
-                })
+                ? {
+                    gasPrice: new bignumber_js_1.default(gasInfo.gasPriceEstimate),
+                    gasLimit: new bignumber_js_1.default(gasInfo.gasBumpEstimate)
+                }
                 : null;
             return {
                 trade: new oneinch_ccr_trade_1.OneinchCcrTrade({
@@ -74,6 +75,9 @@ class OneinchCcrProvider extends cross_chain_provider_1.CrossChainProvider {
             };
         }
     }
+    async getFeeInfo(fromBlockchain, providerAddress, percentFeeToken, useProxy) {
+        return proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getFeeInfo(fromBlockchain, providerAddress, percentFeeToken, useProxy);
+    }
     async getRoutePath(fromToken, toToken) {
         return [{ type: 'cross-chain', provider: this.type, path: [fromToken, toToken] }];
     }

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneinch-ccr-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oneinch-ccr-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.ts"],"names":[],"mappings":"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"}

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.d.ts

@@ -12,9 +12,8 @@ import { FeeInfo } from '../common/models/fee-info';
 import { GetContractParamsOptions } from '../common/models/get-contract-params-options';
 import { OnChainSubtype } from '../common/models/on-chain-subtype';
 import { TradeInfo } from '../common/models/trade-info';
-import { OneinchCcrTradeParams, OneinchGetGasDataParams } from './models/oneinch-ccr-trade-types';
+import { OneinchCcrTradeParams } from './models/oneinch-ccr-trade-types';
 export declare class OneinchCcrTrade extends EvmCrossChainTrade {
-    static getGasData({ feeInfo, from, providerAddress, quote, toToken, slippage }: OneinchGetGasDataParams): Promise<GasData | null>;
     readonly type: CrossChainTradeType;
     readonly isAggregator: boolean;
     readonly to: PriceTokenAmount<EvmBlockchainName>;
@@ -28,13 +27,17 @@ export declare class OneinchCcrTrade extends EvmCrossChainTrade {
     private readonly slippage;
     private readonly quote;
     private get fromWithoutFee();
+    oneinchOrderHash: string;
     /**
      * zkSync currently unavailable in fusion+ system
      */
     protected get fromContractAddress(): string;
+    private get permit2Address();
     protected get methodName(): string;
     constructor(params: OneinchCcrTradeParams);
     swap(options?: SwapTransactionOptions): Promise<string | never>;
+    private needDefaultApprove;
+    private needPermit2Approve;
     protected getContractParams(_options: GetContractParamsOptions, _skipAmountChangeCheck?: boolean): Promise<ContractParams>;
     protected getTransactionConfigAndAmount(_receiverAddress?: string): Promise<{
         config: EvmEncodeConfig;

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js

@@ -1,39 +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.OneinchCcrTrade = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 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 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 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 evm_cross_chain_trade_1 = require("../common/emv-cross-chain-trade/evm-cross-chain-trade");
 const bridge_type_1 = require("../common/models/bridge-type");
 const oneinch_ccr_api_service_1 = require("./services/oneinch-ccr-api-service");
 const oneinch_ccr_utils_1 = require("./services/oneinch-ccr-utils");
 class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
-    static async getGasData({ feeInfo, from, providerAddress, quote, toToken, slippage }) {
-        try {
-            const trade = new OneinchCcrTrade({
-                crossChainTrade: {
-                    from,
-                    to: toToken,
-                    gasData: null,
-                    priceImpact: 0,
-                    feeInfo,
-                    quote,
-                    slippage
-                },
-                providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
-                routePath: [],
-                useProxy: false
-            });
-            return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
-        }
-        catch (_err) {
-            return null;
-        }
-    }
     get fromWithoutFee() {
         return (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
     }
@@ -41,10 +22,15 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
      * zkSync currently unavailable in fusion+ system
      */
     get fromContractAddress() {
-        return this.from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC
+        return this.from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC
             ? '0x111111125421ca6dc452d289314280a0f8842a65'
             : '0x6fd4383cb451173d5f9304f041c7bcbf27d561ff';
     }
+    get permit2Address() {
+        return this.from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC
+            ? '0x000000000022D473030F116dDEE9F6B43aC78BA3'
+            : '0x0000000000225e31D15943971F47aD3022F714Fa';
+    }
     get methodName() {
         throw new Error('[OneinchCcrTrade_methodName] Proxy swaps are not available.');
     }
@@ -60,33 +46,80 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
         this.gasData = params.crossChainTrade.gasData;
         this.priceImpact = params.crossChainTrade.priceImpact;
         this.slippage = params.crossChainTrade.slippage;
-        this.toTokenAmountMin = this.to.weiAmountMinusSlippage(this.slippage);
+        this.toTokenAmountMin = web3_pure_1.Web3Pure.fromWei(this.to.weiAmountMinusSlippage(this.slippage), this.to.decimals);
         this.quote = params.crossChainTrade.quote;
     }
     async swap(options = {}) {
         if (!options?.testMode) {
             await this.checkTradeErrors();
         }
-        (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(this.walletAddress, options.receiverAddress);
+        (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options.receiverAddress, this.walletAddress);
         try {
             const secretsCount = this.quote.presets[this.quote.recommendedPreset].secretsCount;
-            const secrets = oneinch_ccr_utils_1.OneinchCcrUtils.createSecretHashes(secretsCount);
+            const secretsData = oneinch_ccr_utils_1.OneinchCcrUtils.createSecretHashes(secretsCount);
+            const secretHashes = secretsData.map(el => el.hashedSecret);
+            const secrets = secretsData.map(el => el.secret);
             const swapOrder = await oneinch_ccr_api_service_1.OneinchCcrApiService.buildSwapOrder({
                 srcToken: this.fromWithoutFee,
                 dstToken: this.to,
                 walletAddress: this.walletAddress,
                 quote: this.quote,
-                secretHashes: secrets
+                secretHashes: secretHashes
             });
-            options.onConfirm?.(swapOrder.orderHash);
-            await oneinch_ccr_api_service_1.OneinchCcrApiService.submitSwapOrder(this.quote, swapOrder, this.walletAddress, secrets);
-            oneinch_ccr_utils_1.OneinchCcrUtils.listenForSecretsReadiness(swapOrder.orderHash, secrets);
-            return swapOrder.orderHash;
+            this.oneinchOrderHash = swapOrder.orderHash;
+            await oneinch_ccr_api_service_1.OneinchCcrApiService.submitSwapOrder(this.quote, swapOrder, this.walletAddress, secretHashes);
+            const txHash = await oneinch_ccr_utils_1.OneinchCcrUtils.listenForSecretsReadiness(swapOrder.orderHash, secrets);
+            options.onConfirm?.(txHash);
+            return txHash;
         }
         catch (err) {
             throw err;
         }
     }
+    // public override async needApprove(): Promise<boolean> {
+    //     if (this.from.isNative) return false;
+    //     const needPermit2Approve = await this.needPermit2Approve();
+    //     const needApprove = await this.needDefaultApprove();
+    //     return needPermit2Approve || needApprove;
+    // }
+    // public override async approve(
+    //     options: EvmBasicTransactionOptions,
+    //     _checkNeedApprove: boolean = true,
+    //     amount: BigNumber | 'infinity' = 'infinity'
+    // ): Promise<TransactionReceipt> {
+    //     this.checkWalletConnected();
+    //     await this.checkBlockchainCorrect();
+    //     const needDefaultApprove = await this.needDefaultApprove();
+    //     const needPermit2Approve = await this.needPermit2Approve();
+    //     let txReceipt: TransactionReceipt = {} as TransactionReceipt;
+    //     if (needPermit2Approve) {
+    //         txReceipt = await this.web3Private.approveOnPermit2(
+    //             this.from.address,
+    //             this.permit2Address,
+    //             this.fromContractAddress,
+    //             amount,
+    //             new BigNumber(900_000),
+    //             options
+    //         );
+    //     }
+    //     if (needDefaultApprove) {
+    //         txReceipt = await this.web3Private.approveTokens(
+    //             this.from.address,
+    //             this.permit2Address,
+    //             amount,
+    //             options
+    //         );
+    //     }
+    //     return txReceipt;
+    // }
+    async needDefaultApprove() {
+        const allowance = await this.fromWeb3Public.getAllowance(this.from.address, this.walletAddress, this.fromContractAddress);
+        return this.from.weiAmount.gt(allowance);
+    }
+    async needPermit2Approve() {
+        const [allowance, expiration] = await this.fromWeb3Public.getAllowanceAndExpirationOnPermit2(this.from.address, this.walletAddress, this.fromContractAddress, this.permit2Address);
+        return this.from.weiAmount.gt(allowance) || new bignumber_js_1.default(Date.now()).gt(expiration);
+    }
     async getContractParams(_options, _skipAmountChangeCheck) {
         throw new Error('[OneinchCcrTrade_getContractParams] Fee is taken in order params `fee` and `feeReceiver`.');
     }

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":";;;AAEA,gFAAgG;AAChG,6GAAwG;AAIxG,qHAA+G;AAC/G,yFAAmF;AAEnF,gFAAkG;AAClG,mFAA4E;AAC5E,iGAA2F;AAE3F,8DAAuE;AAOvE,gFAA0E;AAC1E,oEAA+D;AAE/D,MAAa,eAAgB,SAAQ,0CAAkB;IAC5C,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,IAAI,EACJ,eAAe,EACf,KAAK,EACL,OAAO,EACP,QAAQ,EACc;QACtB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC;gBAC9B,eAAe,EAAE;oBACb,IAAI;oBACJ,EAAE,EAAE,OAAO;oBACX,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,CAAC;oBACd,OAAO;oBACP,KAAK;oBACL,QAAQ;iBACX;gBACD,eAAe,EAAE,eAAe,IAAI,2BAAW,CAAC,aAAa;gBAC7D,SAAS,EAAE,EAAE;gBACb,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;YAEH,OAAO,IAAA,+CAAoB,EAAC,KAAK,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IA0BD,IAAY,cAAc;QACtB,OAAO,IAAA,wCAAiB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAED;;OAEG;IACH,IAAc,mBAAmB;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,OAAO;YACnD,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,4CAA4C,CAAC;IACvD,CAAC;IAED,IAAc,UAAU;QACpB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,YAAY,MAA6B;QACrC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QA1CrD,SAAI,GAAwB,+CAAsB,CAAC,OAAO,CAAC;QAE3D,iBAAY,GAAY,IAAI,CAAC;QAU7B,mBAAc,GAAmB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;QAEpE,eAAU,GAAe,yBAAW,CAAC,OAAO,CAAC;QA6BzD,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC;QACtD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC;QAChD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAkC,EAAE;QAClD,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAClC,CAAC;QACD,IAAA,oEAA+B,EAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAE7E,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC;YACnF,MAAM,OAAO,GAAG,mCAAe,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAEjE,MAAM,SAAS,GAAG,MAAM,8CAAoB,CAAC,cAAc,CAAC;gBACxD,QAAQ,EAAE,IAAI,CAAC,cAAc;gBAC7B,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,YAAY,EAAE,OAAO;aACxB,CAAC,CAAC;YACH,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAEzC,MAAM,8CAAoB,CAAC,eAAe,CACtC,IAAI,CAAC,KAAK,EACV,SAAS,EACT,IAAI,CAAC,aAAa,EAClB,OAAO,CACV,CAAC;YAEF,mCAAe,CAAC,yBAAyB,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAExE,OAAO,SAAS,CAAC,SAAS,CAAC;QAC/B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC7B,QAAkC,EAClC,sBAAgC;QAEhC,MAAM,IAAI,KAAK,CACX,2FAA2F,CAC9F,CAAC;IACN,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,gBAAyB;QAEzB,MAAM,QAAQ,GAAG,MAAM,8CAAoB,CAAC,UAAU,CAAC;YACnD,QAAQ,EAAE,IAAI,CAAC,cAAc;YAC7B,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,aAAa,EAAE,IAAI,CAAC,aAAa;SACpC,CAAC,CAAC;QAEH,OAAO;YACH,MAAM,EAAE;gBACJ,IAAI,EAAE,EAAE;gBACR,EAAE,EAAE,EAAE;gBACN,KAAK,EAAE,EAAE;aACZ;YACD,MAAM,EAAE,QAAQ,CAAC,cAAc;SAClC,CAAC;IACN,CAAC;IAEM,YAAY;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,GAAG,GAAG;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC;IACN,CAAC;CACJ;AA3JD,0CA2JC"}
+{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":"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"}

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.d.ts

@@ -1,13 +1,20 @@
 import { TxStatusData } from '../../../../../common/status-manager/models/tx-status-data';
-import { CrossChainTradeData } from '../../../../status-manager/models/cross-chain-trade-data';
 import { OneinchCcrQuoteResponse, OneinchQuoteParams, OneinchReadySecretsResponse, OneinchSwapOrderParams, OneinchSwapOrderResponse } from '../models/oneinch-api-types';
 export declare class OneinchCcrApiService {
     private static readonly apiUrl;
+    private static readonly xApiUrl;
     private static readonly apiKey;
     static fetchQuote({ srcToken, dstToken, walletAddress }: OneinchQuoteParams): Promise<OneinchCcrQuoteResponse>;
+    /**
+     * @TODO add fee=100&
+feeReceiver=${address}&
+source=rubic&
+     *  */
     static buildSwapOrder({ dstToken, srcToken, walletAddress, quote, secretHashes }: OneinchSwapOrderParams): Promise<OneinchSwapOrderResponse>;
     static submitSwapOrder(quoteResp: OneinchCcrQuoteResponse, swapResp: OneinchSwapOrderResponse, walletAddress: string, secretHashes: string[]): Promise<void>;
     static fetchReadySecrets(orderHash: string): Promise<OneinchReadySecretsResponse>;
     static submitSecretForSwapOrder(orderHash: string, secret: string): Promise<void>;
-    static fetchTxStatus(data: CrossChainTradeData): Promise<TxStatusData>;
+    static fetchTxStatus(orderHash: string): Promise<TxStatusData>;
+    private static catchApiError;
+    private static getApiTokenAddress;
 }

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js

@@ -1,48 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OneinchCcrApiService = void 0;
+const errors_1 = require("../../../../../../common/errors");
 const blockchain_id_1 = require("../../../../../../core/blockchain/utils/blockchains-info/constants/blockchain-id");
 const tx_status_1 = require("../../../../../../core/blockchain/web3-public-service/web3-public/models/tx-status");
 const injector_1 = require("../../../../../../core/injector/injector");
 const fake_wallet_address_1 = require("../../../../../common/constants/fake-wallet-address");
+const oneinch_ccr_native_address_1 = require("../constants/oneinch-ccr-native-address");
 const oneinch_ccr_utils_1 = require("./oneinch-ccr-utils");
 class OneinchCcrApiService {
     static async fetchQuote({ srcToken, dstToken, walletAddress }) {
         try {
-            const res = await injector_1.Injector.httpClient.get(`${this.apiUrl}/quoter/v1.0/quote/receive`, {
+            const res = await this.catchApiError(injector_1.Injector.httpClient.get(`${this.xApiUrl}/quoter/v1.0/quote/receive`, {
                 headers: { apikey: this.apiKey },
                 params: {
                     srcChain: blockchain_id_1.blockchainId[srcToken.blockchain],
                     dstChain: blockchain_id_1.blockchainId[dstToken.blockchain],
-                    srcTokenAddress: srcToken.address,
-                    dstTokenAddress: dstToken.address,
+                    srcTokenAddress: this.getApiTokenAddress(srcToken),
+                    dstTokenAddress: this.getApiTokenAddress(dstToken),
                     amount: srcToken.stringWeiAmount,
                     walletAddress: walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS,
-                    enableEstimate: false,
-                    fee: 100,
-                    source: 'rubic'
+                    enableEstimate: true
+                    // fee: 100
+                    // source: 'rubic'
                 }
-            });
+            }));
             return res;
         }
         catch (err) {
             throw err;
         }
     }
-    // @TODO add feeReceiver
+    /**
+     * @TODO add fee=100&
+feeReceiver=${address}&
+source=rubic&
+     *  */
     static async buildSwapOrder({ dstToken, srcToken, walletAddress, quote, secretHashes }) {
         try {
             const queryParams = `srcChain=${blockchain_id_1.blockchainId[srcToken.blockchain]}&
 dstChain=${blockchain_id_1.blockchainId[dstToken.blockchain]}&
-srcTokenAddress=${srcToken.address}&
-dstTokenAddress=${dstToken.address}&
+srcTokenAddress=${this.getApiTokenAddress(srcToken)}&
+dstTokenAddress=${this.getApiTokenAddress(dstToken)}&
 amount=${srcToken.stringWeiAmount}&
 walletAddress=${walletAddress}&
-fee=100&
-feeReceiver=${walletAddress}&
-source=rubic&
 preset=${quote.recommendedPreset}`;
-            const res = await injector_1.Injector.httpClient.post(`${this.apiUrl}/quoter/v1.0/quote/build?${queryParams}`, { quote: quote, secretsHashList: secretHashes }, { headers: { apikey: this.apiKey } });
+            const res = await this.catchApiError(injector_1.Injector.httpClient.post(`${this.xApiUrl}/quoter/v1.0/quote/build?${queryParams}`, { quote: quote, secretsHashList: secretHashes }, { headers: { apikey: this.apiKey } }));
             return res;
         }
         catch (err) {
@@ -52,14 +55,28 @@ preset=${quote.recommendedPreset}`;
     static async submitSwapOrder(quoteResp, swapResp, walletAddress, secretHashes) {
         try {
             const signature = await oneinch_ccr_utils_1.OneinchCcrUtils.signTypedData(swapResp.typedData, walletAddress);
-            const res = await injector_1.Injector.httpClient.post(`${this.apiUrl}/relayer/v1.0/submit`, {
+            const res = await injector_1.Injector.httpClient.post(`${this.xApiUrl}/relayer/v1.0/submit`, {
                 signature,
                 order: swapResp.typedData.message,
                 srcChainId: swapResp.typedData.domain.chainId,
                 extension: swapResp.extension,
                 quoteId: quoteResp.quoteId,
-                secretHashes
+                ...(secretHashes.length > 1 && { secretHashes })
             }, { headers: { apikey: this.apiKey } });
+            // const res = await this.catchApiError(
+            //     Injector.httpClient.post(
+            //         `${this.xApiUrl}/relayer/v1.0/submit`,
+            //         {
+            //             signature,
+            //             order: swapResp.typedData.message,
+            //             srcChainId: swapResp.typedData.domain.chainId,
+            //             extension: swapResp.extension,
+            //             quoteId: quoteResp.quoteId,
+            //             ...(secretHashes.length > 1 && { secretHashes })
+            //         },
+            //         { headers: { apikey: this.apiKey } }
+            //     )
+            // );
             console.log(`[OneinchCcrApiService_submitSwapOrder] %cResponse is ${res}`, 'color: green; font-size: 24px;');
         }
         catch (err) {
@@ -68,7 +85,7 @@ preset=${quote.recommendedPreset}`;
     }
     static async fetchReadySecrets(orderHash) {
         try {
-            const readySecrets = await injector_1.Injector.httpClient.get(`${this.apiUrl}/orders/v1.0/order/ready-to-accept-secret-fills/${orderHash}`, { headers: { apikey: this.apiKey } });
+            const readySecrets = await this.catchApiError(injector_1.Injector.httpClient.get(`${this.xApiUrl}/orders/v1.0/order/ready-to-accept-secret-fills/${orderHash}`, { headers: { apikey: this.apiKey } }));
             return readySecrets;
         }
         catch (err) {
@@ -77,18 +94,18 @@ preset=${quote.recommendedPreset}`;
     }
     static async submitSecretForSwapOrder(orderHash, secret) {
         try {
-            await injector_1.Injector.httpClient.post(`${this.apiUrl}/relayer/v1.0/submit/secret`, {
+            await this.catchApiError(injector_1.Injector.httpClient.post(`${this.xApiUrl}/relayer/v1.0/submit/secret`, {
                 secret,
                 orderHash
-            }, { headers: { apikey: this.apiKey } });
+            }, { headers: { apikey: this.apiKey } }));
         }
         catch (err) {
             throw err;
         }
     }
-    static async fetchTxStatus(data) {
+    static async fetchTxStatus(orderHash) {
         try {
-            const { status, orderHash } = await injector_1.Injector.httpClient.get(`${this.apiUrl}/orders/v1.0/order/status/${data.srcTxHash}`);
+            const { status } = await this.catchApiError(injector_1.Injector.httpClient.get(`${this.xApiUrl}/orders/v1.0/order/status/${orderHash}`));
             if (status === 'cancelled' || status === 'expired') {
                 return {
                     hash: null,
@@ -107,8 +124,18 @@ preset=${quote.recommendedPreset}`;
             return { status: tx_status_1.TX_STATUS.PENDING, hash: null };
         }
     }
+    static async catchApiError(req) {
+        const res = await req;
+        if ('error' in res)
+            throw new errors_1.RubicSdkError(res.description);
+        return res;
+    }
+    static getApiTokenAddress(token) {
+        return token.isNative ? oneinch_ccr_native_address_1.ONEINCH_NATIVE_ADDRESS : token.address;
+    }
 }
 exports.OneinchCcrApiService = OneinchCcrApiService;
 OneinchCcrApiService.apiUrl = 'https://api.1inch.dev/fusion-plus';
+OneinchCcrApiService.xApiUrl = 'https://x-api.rubic.exchange/api/fusion-plus';
 OneinchCcrApiService.apiKey = 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4';
 //# sourceMappingURL=oneinch-ccr-api-service.js.map

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":"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"}

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.d.ts

@@ -1,12 +1,16 @@
+import { OneinchSecret } from '../models/oneinch-api-types';
+type SrcTxHash = string;
 export declare class OneinchCcrUtils {
     /**
      * submits each ready secret created in createSecretHashes array untill all secrets will be submitted
+     * @warning used only for orders with more than 1 secrets
      */
-    static listenForSecretsReadiness(orderHash: string, secrets: string[]): void;
+    static listenForSecretsReadiness(orderHash: string, secrets: string[]): Promise<SrcTxHash>;
     /**
      * @returns signature of signed calldata
      */
     static signTypedData(typedData: object, walletAddress: string): Promise<string>;
-    static createSecretHashes(secretsCount: number): string[];
+    static createSecretHashes(secretsCount: number): OneinchSecret[];
     private static getRandom32BitHex;
 }
+export {};

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js

@@ -7,25 +7,32 @@ const oneinch_ccr_api_service_1 = require("./oneinch-ccr-api-service");
 class OneinchCcrUtils {
     /**
      * submits each ready secret created in createSecretHashes array untill all secrets will be submitted
+     * @warning used only for orders with more than 1 secrets
      */
-    static listenForSecretsReadiness(orderHash, secrets) {
+    static async listenForSecretsReadiness(orderHash, secrets) {
         const submittedSecrets = {};
         const deadlineMS = Date.now() + 1000 * 900; // 15 minutes
-        (async () => {
-            while (true) {
-                await (0, waitFor_1.waitFor)(30000);
-                const isAllSecretsSubmitted = secrets.every((hash, ind) => submittedSecrets[ind] === hash);
-                if (isAllSecretsSubmitted || Date.now() > deadlineMS)
-                    break;
-                const readySecrets = await oneinch_ccr_api_service_1.OneinchCcrApiService.fetchReadySecrets(orderHash).catch(() => null);
-                if (!readySecrets || !readySecrets.fills.length)
-                    continue;
-                for (const secret of readySecrets.fills) {
+        let srcTxHash = '';
+        while (Date.now() < deadlineMS) {
+            await (0, waitFor_1.waitFor)(15000);
+            const isAllSecretsSubmitted = secrets.every((hash, ind) => submittedSecrets[ind] === hash);
+            if (isAllSecretsSubmitted)
+                break;
+            const readySecrets = await oneinch_ccr_api_service_1.OneinchCcrApiService.fetchReadySecrets(orderHash).catch(() => null);
+            if (!readySecrets || !readySecrets.fills.length)
+                continue;
+            for (const secret of readySecrets.fills) {
+                const isSubmitted = !!submittedSecrets[secret.idx];
+                if (!isSubmitted) {
+                    await oneinch_ccr_api_service_1.OneinchCcrApiService.submitSecretForSwapOrder(orderHash, secrets[secret.idx]);
                     submittedSecrets[secret.idx] = secrets[secret.idx];
                 }
+                if (secret.idx === 0) {
+                    srcTxHash = secret.srcEscrowDeployTxHash;
+                }
             }
-            await Promise.all(secrets.map(secret => oneinch_ccr_api_service_1.OneinchCcrApiService.submitSecretForSwapOrder(orderHash, secret)));
-        })();
+        }
+        return srcTxHash;
     }
     /**
      * @returns signature of signed calldata
@@ -40,7 +47,7 @@ class OneinchCcrUtils {
     static createSecretHashes(secretsCount) {
         const secretHashes = Array.from({ length: secretsCount })
             .map(() => this.getRandom32BitHex())
-            .map(secret => ethers_1.ethers.utils.keccak256(secret));
+            .map(secret => ({ hashedSecret: ethers_1.ethers.utils.keccak256(secret), secret }));
         return secretHashes;
     }
     static getRandom32BitHex() {

package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneinch-ccr-utils.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,sDAAmD;AAEnD,uEAAiE;AAIjE,MAAa,eAAe;IACxB;;OAEG;IACI,MAAM,CAAC,yBAAyB,CAAC,SAAiB,EAAE,OAAiB;QACxE,MAAM,gBAAgB,GAAG,EAAqC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAK,GAAG,GAAG,CAAC,CAAC,aAAa;QAE1D,CAAC,KAAK,IAAI,EAAE;YACR,OAAO,IAAI,EAAE,CAAC;gBACV,MAAM,IAAA,iBAAO,EAAC,KAAM,CAAC,CAAC;gBAEtB,MAAM,qBAAqB,GAAG,OAAO,CAAC,KAAK,CACvC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,IAAI,CAChD,CAAC;gBACF,IAAI,qBAAqB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU;oBAAE,MAAM;gBAE5D,MAAM,YAAY,GAAG,MAAM,8CAAoB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,KAAK,CAC9E,GAAG,EAAE,CAAC,IAAI,CACb,CAAC;gBACF,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM;oBAAE,SAAS;gBAE1D,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;oBACtC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAW,CAAC;gBACjE,CAAC;YACL,CAAC;YAED,MAAM,OAAO,CAAC,GAAG,CACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACjB,8CAAoB,CAAC,wBAAwB,CAAC,SAAS,EAAE,MAAM,CAAC,CACnE,CACJ,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,aAAqB;QACtE,MAAM,SAAS,GAAG,MAAO,MAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrD,MAAM,EAAE,sBAAsB;YAC9B,MAAM,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;aACpD,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;aACnC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,MAAM,CAAC,iBAAiB;QAC5B,OAAO,CACH,IAAI;YACJ,CAAC,GAAG,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CACvF,CAAC;IACN,CAAC;CACJ;AA7DD,0CA6DC"}
+{"version":3,"file":"oneinch-ccr-utils.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,sDAAmD;AAGnD,uEAAiE;AAKjE,MAAa,eAAe;IACxB;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,yBAAyB,CACzC,SAAiB,EACjB,OAAiB;QAEjB,MAAM,gBAAgB,GAAG,EAAiC,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAK,GAAG,GAAG,CAAC,CAAC,aAAa;QAC1D,IAAI,SAAS,GAAG,EAAE,CAAC;QAEnB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;YAC7B,MAAM,IAAA,iBAAO,EAAC,KAAM,CAAC,CAAC;YAEtB,MAAM,qBAAqB,GAAG,OAAO,CAAC,KAAK,CACvC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,IAAI,CAChD,CAAC;YACF,IAAI,qBAAqB;gBAAE,MAAM;YAEjC,MAAM,YAAY,GAAG,MAAM,8CAAoB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,KAAK,CAC9E,GAAG,EAAE,CAAC,IAAI,CACb,CAAC;YACF,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM;gBAAE,SAAS;YAE1D,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;gBACtC,MAAM,WAAW,GAAG,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACnD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACf,MAAM,8CAAoB,CAAC,wBAAwB,CAC/C,SAAS,EACT,OAAO,CAAC,MAAM,CAAC,GAAG,CAAW,CAChC,CAAC;oBACF,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAW,CAAC;gBACjE,CAAC;gBACD,IAAI,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;oBACnB,SAAS,GAAG,MAAM,CAAC,qBAAqB,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,aAAqB;QACtE,MAAM,SAAS,GAAG,MAAO,MAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrD,MAAM,EAAE,sBAAsB;YAC9B,MAAM,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;aACpD,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;aACnC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAE/E,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,MAAM,CAAC,iBAAiB;QAC5B,OAAO,CACH,IAAI;YACJ,CAAC,GAAG,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CACvF,CAAC;IACN,CAAC;CACJ;AAtED,0CAsEC"}

package/lib/features/cross-chain/status-manager/cross-chain-status-manager.js

@@ -599,7 +599,9 @@ class CrossChainStatusManager {
         return router_api_service_1.RouterApiService.getTxStatus(data);
     }
     getOneinchDstSwapStatus(data) {
-        return oneinch_ccr_api_service_1.OneinchCcrApiService.fetchTxStatus(data);
+        if (!data.oneinchOrderHash)
+            throw new errors_1.RubicSdkError('oneinchOrderHash is required!');
+        return oneinch_ccr_api_service_1.OneinchCcrApiService.fetchTxStatus(data.oneinchOrderHash);
     }
     getRetroBridgeDstSwapStatus(data) {
         if (!data.retroBridgeId) {

package/lib/features/cross-chain/status-manager/cross-chain-status-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"cross-chain-status-manager.js","sourceRoot":"","sources":["../../../../src/features/cross-chain/status-manager/cross-chain-status-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cross-chain-status-manager.js","sourceRoot":"","sources":["../../../../src/features/cross-chain/status-manager/cross-chain-status-manager.ts"],"names":[],"mappings":"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"}

package/lib/features/cross-chain/status-manager/models/cross-chain-trade-data.d.ts

@@ -56,4 +56,8 @@ export interface CrossChainTradeData {
      * Retro bridge transaction id.
      */
     retroBridgeId?: string;
+    /**
+     * Oneinch Fusion+ orderHash to check dst tx status
+     */
+    oneinchOrderHash?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.42.0-alpha.oneinch.2",
+    "version": "5.42.0-alpha.oneinch.20",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",