rubic-sdk 5.42.0-alpha.oneinch.1 → 5.42.0-alpha.oneinch.10
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/constants/cross-chain-providers.d.ts +2 -1
- package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js +3 -1
- package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.js +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/constants/oneinch-ccr-supported-chains.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/models/oneinch-api-types.d.ts +12 -5
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.d.ts +3 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js +4 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.d.ts +3 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js +28 -16
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js +6 -9
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js.map +1 -1
- package/package.json +1 -1
@@ -13,6 +13,7 @@ import { AcrossCrossChainProvider } from '../providers/across-provider/across-cr
|
|
13
13
|
import { EddyBridgeProvider } from '../providers/eddy-bridge/eddy-bridge-provider';
|
14
14
|
import { LayerZeroBridgeProvider } from '../providers/layerzero-bridge/layerzero-bridge-provider';
|
15
15
|
import { MesonCrossChainProvider } from '../providers/meson-provider/meson-cross-chain-provider';
|
16
|
+
import { OneinchCcrProvider } from '../providers/oneinch-provider/oneinch-ccr-provider';
|
16
17
|
import { OrbiterBridgeProvider } from '../providers/orbiter-bridge/orbiter-bridge-provider';
|
17
18
|
import { OwlToBridgeProvider } from '../providers/owl-to-bridge/owl-to-bridge-provider';
|
18
19
|
import { RangoCrossChainProvider } from '../providers/rango-provider/rango-cross-chain-provider';
|
@@ -20,4 +21,4 @@ import { RetroBridgeProvider } from '../providers/retro-bridge/retro-bridge-prov
|
|
20
21
|
import { RouterCrossChainProvider } from '../providers/router-provider/router-cross-chain-provider';
|
21
22
|
import { StargateV2CrossChainProvider } from '../providers/stargate-v2-provider/stargate-v2-cross-chain-provider';
|
22
23
|
import { TaikoBridgeProvider } from '../providers/taiko-bridge/taiko-bridge-provider';
|
23
|
-
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];
|
24
|
+
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];
|
@@ -17,6 +17,7 @@ const across_cross_chain_provider_1 = require("../providers/across-provider/acro
|
|
17
17
|
const eddy_bridge_provider_1 = require("../providers/eddy-bridge/eddy-bridge-provider");
|
18
18
|
const layerzero_bridge_provider_1 = require("../providers/layerzero-bridge/layerzero-bridge-provider");
|
19
19
|
const meson_cross_chain_provider_1 = require("../providers/meson-provider/meson-cross-chain-provider");
|
20
|
+
const oneinch_ccr_provider_1 = require("../providers/oneinch-provider/oneinch-ccr-provider");
|
20
21
|
const orbiter_bridge_provider_1 = require("../providers/orbiter-bridge/orbiter-bridge-provider");
|
21
22
|
const owl_to_bridge_provider_1 = require("../providers/owl-to-bridge/owl-to-bridge-provider");
|
22
23
|
const rango_cross_chain_provider_1 = require("../providers/rango-provider/rango-cross-chain-provider");
|
@@ -41,7 +42,8 @@ const proxyProviders = [
|
|
41
42
|
eddy_bridge_provider_1.EddyBridgeProvider,
|
42
43
|
router_cross_chain_provider_1.RouterCrossChainProvider,
|
43
44
|
retro_bridge_provider_1.RetroBridgeProvider,
|
44
|
-
across_cross_chain_provider_1.AcrossCrossChainProvider
|
45
|
+
across_cross_chain_provider_1.AcrossCrossChainProvider,
|
46
|
+
oneinch_ccr_provider_1.OneinchCcrProvider
|
45
47
|
];
|
46
48
|
const nonProxyProviders = [
|
47
49
|
debridge_cross_chain_provider_1.DebridgeCrossChainProvider,
|
@@ -1 +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;
|
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,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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const oneinchCcrSupportedChains: readonly ["ETH", "OPTIMISM", "BASE", "BSC", "POLYGON", "GNOSIS", "AVALANCHE", "FANTOM", "KLAYTN", "AURORA"];
|
1
|
+
export declare const oneinchCcrSupportedChains: readonly ["ETH", "OPTIMISM", "BASE", "ARBITRUM", "BSC", "POLYGON", "GNOSIS", "AVALANCHE", "FANTOM", "KLAYTN", "AURORA"];
|
2
2
|
export type OneinchCcrSupportedChain = (typeof oneinchCcrSupportedChains)[number];
|
@@ -7,6 +7,7 @@ exports.oneinchCcrSupportedChains = [
|
|
7
7
|
blockchain_name_1.BLOCKCHAIN_NAME.OPTIMISM,
|
8
8
|
// BLOCKCHAIN_NAME.ZK_SYNC, // currently fusion+ doesnt't support zkSync
|
9
9
|
blockchain_name_1.BLOCKCHAIN_NAME.BASE,
|
10
|
+
blockchain_name_1.BLOCKCHAIN_NAME.ARBITRUM,
|
10
11
|
blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN,
|
11
12
|
blockchain_name_1.BLOCKCHAIN_NAME.POLYGON,
|
12
13
|
blockchain_name_1.BLOCKCHAIN_NAME.GNOSIS,
|
@@ -1 +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"}
|
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,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"}
|
@@ -1,5 +1,10 @@
|
|
1
1
|
import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
|
2
2
|
import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
|
3
|
+
export type OneinchResp<T> = T | {
|
4
|
+
description: string;
|
5
|
+
error: string;
|
6
|
+
statusCode: number;
|
7
|
+
};
|
3
8
|
export interface OneinchQuoteParams {
|
4
9
|
srcToken: PriceTokenAmount<EvmBlockchainName>;
|
5
10
|
dstToken: PriceToken<EvmBlockchainName>;
|
@@ -75,9 +80,11 @@ export interface OneinchStatusResponse {
|
|
75
80
|
orderHash: string;
|
76
81
|
status: 'pending' | 'executed' | 'expired' | 'cancelled' | 'refunding' | 'refunded';
|
77
82
|
}
|
78
|
-
export
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
+
export interface OneinchReadySecretsResponse {
|
84
|
+
fills: Array<{
|
85
|
+
idx: number;
|
86
|
+
srcEscrowDeployTxHash: string;
|
87
|
+
dstEscrowDeployTxHash: string;
|
88
|
+
}>;
|
89
|
+
}
|
83
90
|
export {};
|
@@ -3,10 +3,13 @@ import { BlockchainName, EvmBlockchainName } from '../../../../../core/blockchai
|
|
3
3
|
import { RequiredCrossChainOptions } from '../../models/cross-chain-options';
|
4
4
|
import { CrossChainProvider } from '../common/cross-chain-provider';
|
5
5
|
import { CalculationResult } from '../common/models/calculation-result';
|
6
|
+
import { FeeInfo } from '../common/models/fee-info';
|
6
7
|
import { RubicStep } from '../common/models/rubicStep';
|
8
|
+
import { OneinchCcrSupportedChain } from './constants/oneinch-ccr-supported-chains';
|
7
9
|
export declare class OneinchCcrProvider extends CrossChainProvider {
|
8
10
|
readonly type: "oneinch";
|
9
11
|
isSupportedBlockchain(fromBlockchain: BlockchainName): boolean;
|
10
12
|
calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions): Promise<CalculationResult>;
|
13
|
+
protected getFeeInfo(fromBlockchain: OneinchCcrSupportedChain, providerAddress: string, percentFeeToken: PriceTokenAmount, useProxy: boolean): Promise<FeeInfo>;
|
11
14
|
protected getRoutePath(fromToken: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>): Promise<RubicStep[]>;
|
12
15
|
}
|
@@ -9,6 +9,7 @@ const tokens_1 = require("../../../../../common/tokens");
|
|
9
9
|
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
10
10
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
11
11
|
const cross_chain_provider_1 = require("../common/cross-chain-provider");
|
12
|
+
const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
|
12
13
|
const oneinch_ccr_supported_chains_1 = require("./constants/oneinch-ccr-supported-chains");
|
13
14
|
const oneinch_ccr_trade_1 = require("./oneinch-ccr-trade");
|
14
15
|
const oneinch_ccr_api_service_1 = require("./services/oneinch-ccr-api-service");
|
@@ -74,6 +75,9 @@ class OneinchCcrProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
74
75
|
};
|
75
76
|
}
|
76
77
|
}
|
78
|
+
async getFeeInfo(fromBlockchain, providerAddress, percentFeeToken, useProxy) {
|
79
|
+
return proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getFeeInfo(fromBlockchain, providerAddress, percentFeeToken, useProxy);
|
80
|
+
}
|
77
81
|
async getRoutePath(fromToken, toToken) {
|
78
82
|
return [{ type: 'cross-chain', provider: this.type, path: [fromToken, toToken] }];
|
79
83
|
}
|
@@ -1 +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":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;
|
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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"}
|
package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js
CHANGED
@@ -67,7 +67,7 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
67
67
|
if (!options?.testMode) {
|
68
68
|
await this.checkTradeErrors();
|
69
69
|
}
|
70
|
-
(0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(
|
70
|
+
(0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options.receiverAddress, this.walletAddress);
|
71
71
|
try {
|
72
72
|
const secretsCount = this.quote.presets[this.quote.recommendedPreset].secretsCount;
|
73
73
|
const secrets = oneinch_ccr_utils_1.OneinchCcrUtils.createSecretHashes(secretsCount);
|
@@ -1 +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,
|
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":"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"}
|
@@ -3,6 +3,7 @@ import { CrossChainTradeData } from '../../../../status-manager/models/cross-cha
|
|
3
3
|
import { OneinchCcrQuoteResponse, OneinchQuoteParams, OneinchReadySecretsResponse, OneinchSwapOrderParams, OneinchSwapOrderResponse } from '../models/oneinch-api-types';
|
4
4
|
export declare class OneinchCcrApiService {
|
5
5
|
private static readonly apiUrl;
|
6
|
+
private static readonly xApiUrl;
|
6
7
|
private static readonly apiKey;
|
7
8
|
static fetchQuote({ srcToken, dstToken, walletAddress }: OneinchQuoteParams): Promise<OneinchCcrQuoteResponse>;
|
8
9
|
static buildSwapOrder({ dstToken, srcToken, walletAddress, quote, secretHashes }: OneinchSwapOrderParams): Promise<OneinchSwapOrderResponse>;
|
@@ -10,4 +11,6 @@ export declare class OneinchCcrApiService {
|
|
10
11
|
static fetchReadySecrets(orderHash: string): Promise<OneinchReadySecretsResponse>;
|
11
12
|
static submitSecretForSwapOrder(orderHash: string, secret: string): Promise<void>;
|
12
13
|
static fetchTxStatus(data: CrossChainTradeData): Promise<TxStatusData>;
|
14
|
+
private static catchApiError;
|
15
|
+
private static getApiTokenAddress;
|
13
16
|
}
|
@@ -1,28 +1,30 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.OneinchCcrApiService = void 0;
|
4
|
+
const errors_1 = require("../../../../../../common/errors");
|
4
5
|
const blockchain_id_1 = require("../../../../../../core/blockchain/utils/blockchains-info/constants/blockchain-id");
|
5
6
|
const tx_status_1 = require("../../../../../../core/blockchain/web3-public-service/web3-public/models/tx-status");
|
6
7
|
const injector_1 = require("../../../../../../core/injector/injector");
|
7
8
|
const fake_wallet_address_1 = require("../../../../../common/constants/fake-wallet-address");
|
9
|
+
const oneinch_ccr_native_address_1 = require("../constants/oneinch-ccr-native-address");
|
8
10
|
const oneinch_ccr_utils_1 = require("./oneinch-ccr-utils");
|
9
11
|
class OneinchCcrApiService {
|
10
12
|
static async fetchQuote({ srcToken, dstToken, walletAddress }) {
|
11
13
|
try {
|
12
|
-
const res = await injector_1.Injector.httpClient.get(`${this.
|
14
|
+
const res = await this.catchApiError(injector_1.Injector.httpClient.get(`${this.xApiUrl}/quoter/v1.0/quote/receive`, {
|
13
15
|
headers: { apikey: this.apiKey },
|
14
16
|
params: {
|
15
17
|
srcChain: blockchain_id_1.blockchainId[srcToken.blockchain],
|
16
18
|
dstChain: blockchain_id_1.blockchainId[dstToken.blockchain],
|
17
|
-
srcTokenAddress: srcToken
|
18
|
-
dstTokenAddress: dstToken
|
19
|
+
srcTokenAddress: this.getApiTokenAddress(srcToken),
|
20
|
+
dstTokenAddress: this.getApiTokenAddress(dstToken),
|
19
21
|
amount: srcToken.stringWeiAmount,
|
20
22
|
walletAddress: walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS,
|
21
|
-
enableEstimate: false
|
22
|
-
fee: 100
|
23
|
-
source: 'rubic'
|
23
|
+
enableEstimate: false
|
24
|
+
// fee: 100
|
25
|
+
// source: 'rubic'
|
24
26
|
}
|
25
|
-
});
|
27
|
+
}));
|
26
28
|
return res;
|
27
29
|
}
|
28
30
|
catch (err) {
|
@@ -34,15 +36,15 @@ class OneinchCcrApiService {
|
|
34
36
|
try {
|
35
37
|
const queryParams = `srcChain=${blockchain_id_1.blockchainId[srcToken.blockchain]}&
|
36
38
|
dstChain=${blockchain_id_1.blockchainId[dstToken.blockchain]}&
|
37
|
-
srcTokenAddress=${srcToken
|
38
|
-
dstTokenAddress=${dstToken
|
39
|
+
srcTokenAddress=${this.getApiTokenAddress(srcToken)}&
|
40
|
+
dstTokenAddress=${this.getApiTokenAddress(dstToken)}&
|
39
41
|
amount=${srcToken.stringWeiAmount}&
|
40
42
|
walletAddress=${walletAddress}&
|
41
43
|
fee=100&
|
42
44
|
feeReceiver=${walletAddress}&
|
43
45
|
source=rubic&
|
44
46
|
preset=${quote.recommendedPreset}`;
|
45
|
-
const res = await injector_1.Injector.httpClient.post(`${this.
|
47
|
+
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 } }));
|
46
48
|
return res;
|
47
49
|
}
|
48
50
|
catch (err) {
|
@@ -52,14 +54,14 @@ preset=${quote.recommendedPreset}`;
|
|
52
54
|
static async submitSwapOrder(quoteResp, swapResp, walletAddress, secretHashes) {
|
53
55
|
try {
|
54
56
|
const signature = await oneinch_ccr_utils_1.OneinchCcrUtils.signTypedData(swapResp.typedData, walletAddress);
|
55
|
-
const res = await injector_1.Injector.httpClient.post(`${this.
|
57
|
+
const res = await this.catchApiError(injector_1.Injector.httpClient.post(`${this.xApiUrl}/relayer/v1.0/submit`, {
|
56
58
|
signature,
|
57
59
|
order: swapResp.typedData.message,
|
58
60
|
srcChainId: swapResp.typedData.domain.chainId,
|
59
61
|
extension: swapResp.extension,
|
60
62
|
quoteId: quoteResp.quoteId,
|
61
63
|
secretHashes
|
62
|
-
}, { headers: { apikey: this.apiKey } });
|
64
|
+
}, { headers: { apikey: this.apiKey } }));
|
63
65
|
console.log(`[OneinchCcrApiService_submitSwapOrder] %cResponse is ${res}`, 'color: green; font-size: 24px;');
|
64
66
|
}
|
65
67
|
catch (err) {
|
@@ -68,7 +70,7 @@ preset=${quote.recommendedPreset}`;
|
|
68
70
|
}
|
69
71
|
static async fetchReadySecrets(orderHash) {
|
70
72
|
try {
|
71
|
-
const readySecrets = await injector_1.Injector.httpClient.get(`${this.
|
73
|
+
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 } }));
|
72
74
|
return readySecrets;
|
73
75
|
}
|
74
76
|
catch (err) {
|
@@ -77,10 +79,10 @@ preset=${quote.recommendedPreset}`;
|
|
77
79
|
}
|
78
80
|
static async submitSecretForSwapOrder(orderHash, secret) {
|
79
81
|
try {
|
80
|
-
await injector_1.Injector.httpClient.post(`${this.
|
82
|
+
await this.catchApiError(injector_1.Injector.httpClient.post(`${this.xApiUrl}/relayer/v1.0/submit/secret`, {
|
81
83
|
secret,
|
82
84
|
orderHash
|
83
|
-
}, { headers: { apikey: this.apiKey } });
|
85
|
+
}, { headers: { apikey: this.apiKey } }));
|
84
86
|
}
|
85
87
|
catch (err) {
|
86
88
|
throw err;
|
@@ -88,7 +90,7 @@ preset=${quote.recommendedPreset}`;
|
|
88
90
|
}
|
89
91
|
static async fetchTxStatus(data) {
|
90
92
|
try {
|
91
|
-
const { status, orderHash } = await injector_1.Injector.httpClient.get(`${this.
|
93
|
+
const { status, orderHash } = await this.catchApiError(injector_1.Injector.httpClient.get(`${this.xApiUrl}/orders/v1.0/order/status/${data.srcTxHash}`));
|
92
94
|
if (status === 'cancelled' || status === 'expired') {
|
93
95
|
return {
|
94
96
|
hash: null,
|
@@ -107,8 +109,18 @@ preset=${quote.recommendedPreset}`;
|
|
107
109
|
return { status: tx_status_1.TX_STATUS.PENDING, hash: null };
|
108
110
|
}
|
109
111
|
}
|
112
|
+
static async catchApiError(req) {
|
113
|
+
const res = await req;
|
114
|
+
if ('error' in res)
|
115
|
+
throw new errors_1.RubicSdkError(res.description);
|
116
|
+
return res;
|
117
|
+
}
|
118
|
+
static getApiTokenAddress(token) {
|
119
|
+
return token.isNative ? oneinch_ccr_native_address_1.ONEINCH_NATIVE_ADDRESS : token.address;
|
120
|
+
}
|
110
121
|
}
|
111
122
|
exports.OneinchCcrApiService = OneinchCcrApiService;
|
112
123
|
OneinchCcrApiService.apiUrl = 'https://api.1inch.dev/fusion-plus';
|
124
|
+
OneinchCcrApiService.xApiUrl = 'https://x-api.rubic.exchange/api/fusion-plus';
|
113
125
|
OneinchCcrApiService.apiKey = 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4';
|
114
126
|
//# sourceMappingURL=oneinch-ccr-api-service.js.map
|
@@ -1 +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":";;;AAAA,sGAAkG;AAClG,oGAAiG;AACjG,yDAAsD;AACtD,2FAAwF;
|
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":";;;AAAA,8CAAkD;AAElD,sGAAkG;AAClG,oGAAiG;AACjG,yDAAsD;AACtD,2FAAwF;AAIxF,wFAAiF;AAUjF,2DAAsD;AAEtD,MAAa,oBAAoB;IAOtB,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,QAAQ,EACR,QAAQ,EACR,aAAa,EACI;QACjB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAChC,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACnB,GAAG,IAAI,CAAC,OAAO,4BAA4B,EAC3C;gBACI,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;gBAChC,MAAM,EAAE;oBACJ,QAAQ,EAAE,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC3C,QAAQ,EAAE,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC3C,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBAClD,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBAClD,MAAM,EAAE,QAAQ,CAAC,eAAe;oBAChC,aAAa,EAAE,aAAa,IAAI,yCAAmB;oBACnD,cAAc,EAAE,KAAK;oBACrB,WAAW;oBACX,kBAAkB;iBACrB;aACJ,CACJ,CACJ,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,wBAAwB;IACjB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAC/B,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,KAAK,EACL,YAAY,EACS;QACrB,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,YAAY,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;WAClE,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;kBAC1B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;kBACjC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;SAC1C,QAAQ,CAAC,eAAe;gBACjB,aAAa;;cAEf,aAAa;;SAElB,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAEvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAChC,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,GAAG,IAAI,CAAC,OAAO,4BAA4B,WAAW,EAAE,EACxD,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,EAC/C,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CACvC,CACJ,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,eAAe,CAC/B,SAAkC,EAClC,QAAkC,EAClC,aAAqB,EACrB,YAAsB;QAEtB,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,mCAAe,CAAC,aAAa,CACjD,QAAQ,CAAC,SAAS,EAClB,aAAa,CAChB,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAChC,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,GAAG,IAAI,CAAC,OAAO,sBAAsB,EACrC;gBACI,SAAS;gBACT,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO;gBACjC,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO;gBAC7C,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,YAAY;aACf,EACD,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CACvC,CACJ,CAAC;YAEF,OAAO,CAAC,GAAG,CACP,wDAAwD,GAAG,EAAE,EAC7D,gCAAgC,CACnC,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QACnD,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CACzC,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACnB,GAAG,IAAI,CAAC,OAAO,mDAAmD,SAAS,EAAE,EAC7E,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CACvC,CACJ,CAAC;YAEF,OAAO,YAAY,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,SAAiB,EAAE,MAAc;QAC1E,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CACpB,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACpB,GAAG,IAAI,CAAC,OAAO,6BAA6B,EAC5C;gBACI,MAAM;gBACN,SAAS;aACZ,EACD,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CACvC,CACJ,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAyB;QACvD,IAAI,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAClD,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACnB,GAAG,IAAI,CAAC,OAAO,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAC/D,CACJ,CAAC;YAEF,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACjD,OAAO;oBACH,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,qBAAS,CAAC,IAAI;iBACzB,CAAC;YACN,CAAC;YAED,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;gBACxB,OAAO;oBACH,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,qBAAS,CAAC,OAAO;iBAC5B,CAAC;YACN,CAAC;YAED,OAAO,EAAE,MAAM,EAAE,qBAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACrD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,qBAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACrD,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,aAAa,CAAmB,GAA4B;QAC7E,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC;QACtB,IAAI,OAAO,IAAI,GAAG;YAAE,MAAM,IAAI,sBAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE7D,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAAC,KAAiB;QAC/C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,mDAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;IACnE,CAAC;;AAjLL,oDAkLC;AAjL2B,2BAAM,GAAG,mCAAmC,CAAC;AAE7C,4BAAO,GAAG,8CAA8C,CAAC;AAEzD,2BAAM,GAAG,8CAA8C,CAAC"}
|
@@ -12,18 +12,15 @@ class OneinchCcrUtils {
|
|
12
12
|
const submittedSecrets = {};
|
13
13
|
const deadlineMS = Date.now() + 1000 * 900; // 15 minutes
|
14
14
|
(async () => {
|
15
|
-
|
15
|
+
while (true) {
|
16
16
|
await (0, waitFor_1.waitFor)(30000);
|
17
|
-
const isAllSecretsSubmitted = secrets.every((hash, ind) => submittedSecrets[ind]
|
17
|
+
const isAllSecretsSubmitted = secrets.every((hash, ind) => submittedSecrets[ind] === hash);
|
18
18
|
if (isAllSecretsSubmitted || Date.now() > deadlineMS)
|
19
|
-
break
|
19
|
+
break;
|
20
20
|
const readySecrets = await oneinch_ccr_api_service_1.OneinchCcrApiService.fetchReadySecrets(orderHash).catch(() => null);
|
21
|
-
if (!readySecrets)
|
22
|
-
continue
|
23
|
-
|
24
|
-
const isAlreadySubmitted = !!submittedSecrets[secret.idx];
|
25
|
-
if (isAlreadySubmitted)
|
26
|
-
continue Internal;
|
21
|
+
if (!readySecrets || !readySecrets.fills.length)
|
22
|
+
continue;
|
23
|
+
for (const secret of readySecrets.fills) {
|
27
24
|
submittedSecrets[secret.idx] = secrets[secret.idx];
|
28
25
|
}
|
29
26
|
}
|
@@ -1 +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,
|
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"}
|