@synthra-swap/smart-order-router 3.15.24 → 3.15.26
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/build/main/routers/alpha-router/gas-models/gas-model.d.ts +3 -3
- package/build/main/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +31 -23
- package/build/main/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +43 -29
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/gas-factory-helpers.d.ts +24 -0
- package/build/main/util/gas-factory-helpers.js +14 -3
- package/build/module/routers/alpha-router/gas-models/gas-model.d.ts +3 -3
- package/build/module/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js +32 -24
- package/build/module/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.js +45 -31
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/gas-factory-helpers.d.ts +24 -0
- package/build/module/util/gas-factory-helpers.js +14 -3
- package/package.json +1 -1
|
@@ -20,7 +20,7 @@ export declare type BuildOnChainGasModelFactoryType = {
|
|
|
20
20
|
pools: LiquidityCalculationPools;
|
|
21
21
|
amountToken: Token;
|
|
22
22
|
quoteToken: Token;
|
|
23
|
-
v2poolProvider: IV2PoolProvider;
|
|
23
|
+
v2poolProvider: IV2PoolProvider | null;
|
|
24
24
|
l2GasDataProvider?: IL2GasDataProvider<OptimismGasData> | IL2GasDataProvider<ArbitrumGasData>;
|
|
25
25
|
providerConfig?: ProviderConfig;
|
|
26
26
|
};
|
|
@@ -31,7 +31,7 @@ export declare type BuildV2GasModelFactoryType = {
|
|
|
31
31
|
token: Token;
|
|
32
32
|
};
|
|
33
33
|
export declare type LiquidityCalculationPools = {
|
|
34
|
-
usdPool: Pool;
|
|
34
|
+
usdPool: Pool | null;
|
|
35
35
|
nativeQuoteTokenV3Pool: Pool | null;
|
|
36
36
|
nativeAmountTokenV3Pool: Pool | null;
|
|
37
37
|
};
|
|
@@ -85,5 +85,5 @@ export declare abstract class IV2GasModelFactory {
|
|
|
85
85
|
* @class IOnChainGasModelFactory
|
|
86
86
|
*/
|
|
87
87
|
export declare abstract class IOnChainGasModelFactory {
|
|
88
|
-
abstract buildGasModel({ chainId, gasPriceWei, pools
|
|
88
|
+
abstract buildGasModel({ chainId, gasPriceWei, pools, amountToken, quoteToken, v2poolProvider, l2GasDataProvider, }: BuildOnChainGasModelFactoryType): Promise<IGasModel<V3RouteWithValidQuote | MixedRouteWithValidQuote>>;
|
|
89
89
|
}
|
package/build/main/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.js
CHANGED
|
@@ -40,19 +40,21 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
40
40
|
super();
|
|
41
41
|
}
|
|
42
42
|
async buildGasModel({ chainId, gasPriceWei, pools, quoteToken, v2poolProvider: V2poolProvider, }) {
|
|
43
|
+
var _a, _b;
|
|
43
44
|
const usdPool = pools.usdPool;
|
|
44
45
|
// If our quote token is WETH, we don't need to convert our gas use to be in terms
|
|
45
46
|
// of the quote token in order to produce a gas adjusted amount.
|
|
46
47
|
// We do return a gas use in USD however, so we still convert to usd.
|
|
47
48
|
const nativeCurrency = __1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
49
|
+
const fallbackUsdToken = (_b = (_a = gas_model_1.usdGasTokensByChain[chainId]) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : nativeCurrency;
|
|
48
50
|
if (quoteToken.equals(nativeCurrency)) {
|
|
49
51
|
const estimateGasCost = (routeWithValidQuote) => {
|
|
50
52
|
const { totalGasCostNativeCurrency, baseGasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const gasCostInTermsOfUSD = usdPool
|
|
54
|
+
? (usdPool.token0.address == nativeCurrency.address
|
|
55
|
+
? usdPool.token0Price
|
|
56
|
+
: usdPool.token1Price).quote(totalGasCostNativeCurrency)
|
|
57
|
+
: amounts_1.CurrencyAmount.fromRawAmount(fallbackUsdToken, totalGasCostNativeCurrency.quotient.toString());
|
|
56
58
|
return {
|
|
57
59
|
gasEstimate: baseGasUse,
|
|
58
60
|
gasCostInToken: totalGasCostNativeCurrency,
|
|
@@ -71,9 +73,11 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
71
73
|
/// MixedRoutes
|
|
72
74
|
nativeV2Pool = await (0, gas_factory_helpers_1.getV2NativePool)(quoteToken, V2poolProvider);
|
|
73
75
|
}
|
|
74
|
-
const usdToken = usdPool
|
|
75
|
-
? usdPool.
|
|
76
|
-
|
|
76
|
+
const usdToken = usdPool
|
|
77
|
+
? usdPool.token0.address == nativeCurrency.address
|
|
78
|
+
? usdPool.token1
|
|
79
|
+
: usdPool.token0
|
|
80
|
+
: fallbackUsdToken;
|
|
77
81
|
const estimateGasCost = (routeWithValidQuote) => {
|
|
78
82
|
const { totalGasCostNativeCurrency, baseGasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
79
83
|
if (!nativeV3Pool && !nativeV2Pool) {
|
|
@@ -109,22 +113,26 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
109
113
|
throw err;
|
|
110
114
|
}
|
|
111
115
|
// true if token0 is the native currency
|
|
112
|
-
const token0USDPool = usdPool.token0.address == nativeCurrency.address;
|
|
113
|
-
// gets the mid price of the pool in terms of the native token
|
|
114
|
-
const nativeTokenPriceUSDPool = token0USDPool
|
|
115
|
-
? usdPool.token0Price
|
|
116
|
-
: usdPool.token1Price;
|
|
117
116
|
let gasCostInTermsOfUSD;
|
|
118
|
-
|
|
119
|
-
gasCostInTermsOfUSD =
|
|
117
|
+
if (!usdPool) {
|
|
118
|
+
gasCostInTermsOfUSD = amounts_1.CurrencyAmount.fromRawAmount(usdToken, totalGasCostNativeCurrency.quotient.toString());
|
|
120
119
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
120
|
+
else {
|
|
121
|
+
const token0USDPool = usdPool.token0.address == nativeCurrency.address;
|
|
122
|
+
const nativeTokenPriceUSDPool = token0USDPool
|
|
123
|
+
? usdPool.token0Price
|
|
124
|
+
: usdPool.token1Price;
|
|
125
|
+
try {
|
|
126
|
+
gasCostInTermsOfUSD = nativeTokenPriceUSDPool.quote(totalGasCostNativeCurrency);
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
util_1.log.info({
|
|
130
|
+
usdT1: usdPool.token0.symbol,
|
|
131
|
+
usdT2: usdPool.token1.symbol,
|
|
132
|
+
gasCostInNativeToken: totalGasCostNativeCurrency.currency.symbol,
|
|
133
|
+
}, 'Failed to compute USD gas price');
|
|
134
|
+
throw err;
|
|
135
|
+
}
|
|
128
136
|
}
|
|
129
137
|
return {
|
|
130
138
|
gasEstimate: baseGasUse,
|
|
@@ -172,4 +180,4 @@ class MixedRouteHeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFac
|
|
|
172
180
|
}
|
|
173
181
|
}
|
|
174
182
|
exports.MixedRouteHeuristicGasModelFactory = MixedRouteHeuristicGasModelFactory;
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9yb3V0ZXJzL2FscGhhLXJvdXRlci9nYXMtbW9kZWxzL21peGVkUm91dGUvbWl4ZWQtcm91dGUtaGV1cmlzdGljLWdhcy1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBcUQ7QUFFckQsb0RBQW9FO0FBQ3BFLDRDQUF1QztBQUN2Qyw0Q0FBdUM7QUFDdkMsZ0RBQXdCO0FBQ3hCLG9EQUF1QjtBQUV2QixtQ0FBc0Q7QUFDdEQsMkNBQXVDO0FBQ3ZDLHNEQUEwRDtBQUMxRCw4RUFBdUU7QUFFdkUsNENBS3NCO0FBQ3RCLHlFQUdzQztBQUN0QywrQ0FLeUI7QUFFekI7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBaUJHO0FBQ0gsTUFBYSxrQ0FBbUMsU0FBUSxtQ0FBdUI7SUFDN0U7UUFDRSxLQUFLLEVBQUUsQ0FBQztJQUNWLENBQUM7SUFFTSxLQUFLLENBQUMsYUFBYSxDQUFDLEVBQ3pCLE9BQU8sRUFDUCxXQUFXLEVBQ1gsS0FBSyxFQUNMLFVBQVUsRUFDVixjQUFjLEVBQUUsY0FBYyxHQUNFOztRQUdsQyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDO1FBRTVCLGtGQUFrRjtRQUNsRixnRUFBZ0U7UUFDaEUscUVBQXFFO1FBQ3JFLE1BQU0sY0FBYyxHQUFHLDJCQUF1QixDQUFDLE9BQU8sQ0FBRSxDQUFDO1FBQ3pELE1BQU0sZ0JBQWdCLEdBQ3BCLE1BQUEsTUFBQSwrQkFBbUIsQ0FBQyxPQUFPLENBQUMsMENBQUcsQ0FBQyxDQUFDLG1DQUFJLGNBQWMsQ0FBQztRQUN0RCxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLEVBQUU7WUFDckMsTUFBTSxlQUFlLEdBQUcsQ0FDdEIsbUJBQTZDLEVBSzdDLEVBQUU7Z0JBQ0YsTUFBTSxFQUFFLDBCQUEwQixF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
|
|
@@ -37,10 +37,13 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
37
37
|
super();
|
|
38
38
|
}
|
|
39
39
|
async buildGasModel({ chainId, gasPriceWei, pools, amountToken, quoteToken, l2GasDataProvider, }) {
|
|
40
|
+
var _a, _b;
|
|
40
41
|
const l2GasData = l2GasDataProvider
|
|
41
42
|
? await l2GasDataProvider.getGasData()
|
|
42
43
|
: undefined;
|
|
43
44
|
const usdPool = pools.usdPool;
|
|
45
|
+
const nativeCurrency = __1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
46
|
+
const fallbackUsdToken = (_b = (_a = gas_model_1.usdGasTokensByChain[chainId]) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : nativeCurrency;
|
|
44
47
|
const calculateL1GasFees = async (route) => {
|
|
45
48
|
const swapOptions = {
|
|
46
49
|
type: __1.SwapType.UNIVERSAL_ROUTER,
|
|
@@ -64,13 +67,13 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
64
67
|
[l1Used, l1FeeInWei] = this.calculateArbitrumToL1SecurityFee(route, swapOptions, l2GasData);
|
|
65
68
|
}
|
|
66
69
|
// wrap fee to native currency
|
|
67
|
-
const nativeCurrency = __1.WRAPPED_NATIVE_CURRENCY[chainId];
|
|
68
70
|
const costNativeCurrency = amounts_1.CurrencyAmount.fromRawAmount(nativeCurrency, l1FeeInWei.toString());
|
|
69
71
|
// convert fee into usd
|
|
70
|
-
const
|
|
71
|
-
? usdPool.
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
const gasCostL1USD = usdPool
|
|
73
|
+
? (usdPool.token0.address == nativeCurrency.address
|
|
74
|
+
? usdPool.token0Price
|
|
75
|
+
: usdPool.token1Price).quote(costNativeCurrency)
|
|
76
|
+
: amounts_1.CurrencyAmount.fromRawAmount(fallbackUsdToken, costNativeCurrency.quotient.toString());
|
|
74
77
|
let gasCostL1QuoteToken = costNativeCurrency;
|
|
75
78
|
// if the inputted token is not in the native currency, quote a native/quote token pool to get the gas cost in terms of the quote token
|
|
76
79
|
if (!quoteToken.equals(nativeCurrency)) {
|
|
@@ -97,15 +100,20 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
97
100
|
// If our quote token is WETH, we don't need to convert our gas use to be in terms
|
|
98
101
|
// of the quote token in order to produce a gas adjusted amount.
|
|
99
102
|
// We do return a gas use in USD however, so we still convert to usd.
|
|
100
|
-
const
|
|
103
|
+
const convertNativeToUSD = (amount) => {
|
|
104
|
+
if (!usdPool) {
|
|
105
|
+
return amounts_1.CurrencyAmount.fromRawAmount(fallbackUsdToken, amount.quotient.toString());
|
|
106
|
+
}
|
|
107
|
+
const token0 = usdPool.token0.address == nativeCurrency.address;
|
|
108
|
+
const nativeTokenPrice = token0
|
|
109
|
+
? usdPool.token0Price
|
|
110
|
+
: usdPool.token1Price;
|
|
111
|
+
return nativeTokenPrice.quote(amount);
|
|
112
|
+
};
|
|
101
113
|
if (quoteToken.equals(nativeCurrency)) {
|
|
102
114
|
const estimateGasCost = (routeWithValidQuote) => {
|
|
103
115
|
const { totalGasCostNativeCurrency, baseGasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
104
|
-
const
|
|
105
|
-
const nativeTokenPrice = token0
|
|
106
|
-
? usdPool.token0Price
|
|
107
|
-
: usdPool.token1Price;
|
|
108
|
-
const gasCostInTermsOfUSD = nativeTokenPrice.quote(totalGasCostNativeCurrency);
|
|
116
|
+
const gasCostInTermsOfUSD = convertNativeToUSD(totalGasCostNativeCurrency);
|
|
109
117
|
return {
|
|
110
118
|
gasEstimate: baseGasUse,
|
|
111
119
|
gasCostInToken: totalGasCostNativeCurrency,
|
|
@@ -124,9 +132,11 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
124
132
|
if (!amountToken.equals(nativeCurrency)) {
|
|
125
133
|
nativeAmountPool = pools.nativeAmountTokenV3Pool;
|
|
126
134
|
}
|
|
127
|
-
const usdToken = usdPool
|
|
128
|
-
? usdPool.
|
|
129
|
-
|
|
135
|
+
const usdToken = usdPool
|
|
136
|
+
? usdPool.token0.address == nativeCurrency.address
|
|
137
|
+
? usdPool.token1
|
|
138
|
+
: usdPool.token0
|
|
139
|
+
: fallbackUsdToken;
|
|
130
140
|
const estimateGasCost = (routeWithValidQuote) => {
|
|
131
141
|
const { totalGasCostNativeCurrency, baseGasUse } = this.estimateGas(routeWithValidQuote, gasPriceWei, chainId);
|
|
132
142
|
let gasCostInTermsOfQuoteToken = null;
|
|
@@ -184,22 +194,26 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
184
194
|
}
|
|
185
195
|
}
|
|
186
196
|
// true if token0 is the native currency
|
|
187
|
-
const token0USDPool = usdPool.token0.address == nativeCurrency.address;
|
|
188
|
-
// gets the mid price of the pool in terms of the native token
|
|
189
|
-
const nativeTokenPriceUSDPool = token0USDPool
|
|
190
|
-
? usdPool.token0Price
|
|
191
|
-
: usdPool.token1Price;
|
|
192
197
|
let gasCostInTermsOfUSD;
|
|
193
|
-
|
|
194
|
-
gasCostInTermsOfUSD =
|
|
198
|
+
if (!usdPool) {
|
|
199
|
+
gasCostInTermsOfUSD = amounts_1.CurrencyAmount.fromRawAmount(usdToken, totalGasCostNativeCurrency.quotient.toString());
|
|
195
200
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
201
|
+
else {
|
|
202
|
+
const token0USDPool = usdPool.token0.address == nativeCurrency.address;
|
|
203
|
+
const nativeTokenPriceUSDPool = token0USDPool
|
|
204
|
+
? usdPool.token0Price
|
|
205
|
+
: usdPool.token1Price;
|
|
206
|
+
try {
|
|
207
|
+
gasCostInTermsOfUSD = nativeTokenPriceUSDPool.quote(totalGasCostNativeCurrency);
|
|
208
|
+
}
|
|
209
|
+
catch (err) {
|
|
210
|
+
log_1.log.info({
|
|
211
|
+
usdT1: usdPool.token0.symbol,
|
|
212
|
+
usdT2: usdPool.token1.symbol,
|
|
213
|
+
gasCostInNativeToken: totalGasCostNativeCurrency.currency.symbol,
|
|
214
|
+
}, 'Failed to compute USD gas price');
|
|
215
|
+
throw err;
|
|
216
|
+
}
|
|
203
217
|
}
|
|
204
218
|
// If gasCostInTermsOfQuoteToken is null, both attempts to calculate gasCostInTermsOfQuoteToken failed (nativePool and amountNativePool)
|
|
205
219
|
if (gasCostInTermsOfQuoteToken === null) {
|
|
@@ -297,4 +311,4 @@ class V3HeuristicGasModelFactory extends gas_model_1.IOnChainGasModelFactory {
|
|
|
297
311
|
}
|
|
298
312
|
}
|
|
299
313
|
exports.V3HeuristicGasModelFactory = V3HeuristicGasModelFactory;
|
|
300
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v3-heuristic-gas-model.js","sourceRoot":"","sources":["../../../../../../src/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAqD;AACrD,qDAA4E;AAE5E,oDAAuB;AAEvB,mCAIqB;AAKrB,sDAA0D;AAC1D,8EAAwE;AACxE,8CAA2C;AAC3C,wEAG2C;AAE3C,4CAIsB;AAEtB,2CAOqB;AAErB;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,0BAA2B,SAAQ,mCAAuB;IACrE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,EACzB,OAAO,EACP,WAAW,EACX,KAAK,EACL,WAAW,EACX,UAAU,EACV,iBAAiB,GACe;QAGhC,MAAM,SAAS,GAAG,iBAAiB;YACjC,CAAC,CAAC,MAAM,iBAAiB,CAAC,UAAU,EAAE;YACtC,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,OAAO,GAAS,KAAK,CAAC,OAAO,CAAC;QAEpC,MAAM,kBAAkB,GAAG,KAAK,EAC9B,KAA8B,EAK7B,EAAE;YACH,MAAM,WAAW,GAA+B;gBAC9C,IAAI,EAAE,YAAQ,CAAC,gBAAgB;gBAC/B,SAAS,EAAE,4CAA4C;gBACvD,2BAA2B,EAAE,GAAG;gBAChC,iBAAiB,EAAE,IAAI,kBAAO,CAAC,CAAC,EAAE,KAAM,CAAC;aAC1C,CAAC;YACF,IAAI,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,UAAU,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG;gBACpB,kBAAO,CAAC,QAAQ;gBAChB,kBAAO,CAAC,eAAe;gBACvB,kBAAO,CAAC,IAAI;gBACZ,kBAAO,CAAC,WAAW;aACpB,CAAC;YACF,IAAI,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACnC,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,gCAAgC,CAC1D,KAAK,EACL,WAAW,EACX,SAA4B,CAC7B,CAAC;aACH;iBAAM,IACL,OAAO,IAAI,kBAAO,CAAC,YAAY;gBAC/B,OAAO,IAAI,kBAAO,CAAC,eAAe,EAClC;gBACA,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,gCAAgC,CAC1D,KAAK,EACL,WAAW,EACX,SAA4B,CAC7B,CAAC;aACH;YAED,8BAA8B;YAC9B,MAAM,cAAc,GAAG,2BAAuB,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,kBAAkB,GAAG,wBAAc,CAAC,aAAa,CACrD,cAAc,EACd,UAAU,CAAC,QAAQ,EAAE,CACtB,CAAC;YAEF,uBAAuB;YACvB,MAAM,gBAAgB,GACpB,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;gBAC9C,CAAC,CAAC,OAAO,CAAC,WAAW;gBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAE1B,MAAM,YAAY,GAChB,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE7C,IAAI,mBAAmB,GAAG,kBAAkB,CAAC;YAC7C,uIAAuI;YACvI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBACtC,MAAM,UAAU,GAAgB,KAAK,CAAC,sBAAsB,CAAC;gBAC7D,IAAI,CAAC,UAAU,EAAE;oBACf,SAAG,CAAC,IAAI,CACN,gEAAgE,CACjE,CAAC;oBACF,mBAAmB,GAAG,wBAAc,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;iBACnE;qBAAM;oBACL,MAAM,gBAAgB,GACpB,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;wBACjD,CAAC,CAAC,UAAU,CAAC,WAAW;wBACxB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;oBAC7B,mBAAmB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBAClE;aACF;YACD,4EAA4E;YAC5E,kFAAkF;YAClF,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,YAAY;gBACZ,mBAAmB;aACpB,CAAC;QACJ,CAAC,CAAC;QAEF,kFAAkF;QAClF,gEAAgE;QAChE,qEAAqE;QACrE,MAAM,cAAc,GAAG,2BAAuB,CAAC,OAAO,CAAE,CAAC;QACzD,IAAI,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACrC,MAAM,eAAe,GAAG,CACtB,mBAA0C,EAK1C,EAAE;gBACF,MAAM,EAAE,0BAA0B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CACjE,mBAAmB,EACnB,WAAW,EACX,OAAO,CACR,CAAC;gBAEF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBAEhE,MAAM,gBAAgB,GAAG,MAAM;oBAC7B,CAAC,CAAC,OAAO,CAAC,WAAW;oBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;gBAExB,MAAM,mBAAmB,GAAmB,gBAAgB,CAAC,KAAK,CAChE,0BAA0B,CACT,CAAC;gBAEpB,OAAO;oBACL,WAAW,EAAE,UAAU;oBACvB,cAAc,EAAE,0BAA0B;oBAC1C,YAAY,EAAE,mBAAmB;iBAClC,CAAC;YACJ,CAAC,CAAC;YAEF,OAAO;gBACL,eAAe;gBACf,kBAAkB;aACnB,CAAC;SACH;QAED,+GAA+G;QAC/G,6GAA6G;QAC7G,MAAM,UAAU,GAAgB,KAAK,CAAC,sBAAsB,CAAC;QAE7D,IAAI,gBAAgB,GAAgB,IAAI,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACvC,gBAAgB,GAAG,KAAK,CAAC,uBAAuB,CAAC;SAClD;QAED,MAAM,QAAQ,GACZ,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;YAC9C,CAAC,CAAC,OAAO,CAAC,MAAM;YAChB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QAErB,MAAM,eAAe,GAAG,CACtB,mBAA0C,EAK1C,EAAE;YACF,MAAM,EAAE,0BAA0B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CACjE,mBAAmB,EACnB,WAAW,EACX,OAAO,CACR,CAAC;YAEF,IAAI,0BAA0B,GAA0B,IAAI,CAAC;YAC7D,IAAI,UAAU,EAAE;gBACd,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBAEnE,0FAA0F;gBAC1F,MAAM,gBAAgB,GAAG,MAAM;oBAC7B,CAAC,CAAC,UAAU,CAAC,WAAW;oBACxB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;gBAE3B,IAAI;oBACF,gCAAgC;oBAChC,0BAA0B,GAAG,gBAAgB,CAAC,KAAK,CACjD,0BAA0B,CACT,CAAC;iBACrB;gBAAC,OAAO,GAAG,EAAE;oBACZ,SAAG,CAAC,IAAI,CACN;wBACE,oBAAoB,EAAE,gBAAgB,CAAC,YAAY;wBACnD,qBAAqB,EAAE,gBAAgB,CAAC,aAAa;wBACrD,YAAY,EAAE,0BAA0B,CAAC,QAAQ;qBAClD,EACD,6BAA6B,CAC9B,CAAC;oBACF,MAAM,GAAG,CAAC;iBACX;aACF;YACD,mDAAmD;iBAC9C;gBACH,SAAG,CAAC,IAAI,CACN,kBAAkB,cAAc,CAAC,MAAM,+BAA+B,UAAU,CAAC,MAAM,2EAA2E,CACnK,CAAC;aACH;YAED,uDAAuD;YACvD,uGAAuG;YACvG,IAAI,gBAAgB,EAAE;gBACpB,yDAAyD;gBACzD,MAAM,cAAc,GAAG,IAAI,gBAAK,CAC9B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EACnC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAClC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EACnC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CACnC,CAAC;gBAEF,MAAM,aAAa,GACjB,gBAAgB,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBAC5D,0BAA0B;gBAC1B,MAAM,sBAAsB,GAAG,aAAa;oBAC1C,CAAC,CAAC,gBAAgB,CAAC,WAAW;oBAC9B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;gBAEjC,MAAM,2BAA2B,GAAG,sBAAsB,CAAC,KAAK,CAC9D,0BAA0B,CACT,CAAC;gBAEpB,2EAA2E;gBAC3E,MAAM,mCAAmC,GAAG,cAAc,CAAC,KAAK,CAC9D,2BAA2B,CAC5B,CAAC;gBAEF,wGAAwG;gBACxG,kHAAkH;gBAClH,2HAA2H;gBAC3H,IACE,0BAA0B,KAAK,IAAI;oBACnC,mCAAmC,CAAC,QAAQ,CAC1C,0BAA0B,CAAC,UAAU,CACtC,EACD;oBACA,SAAG,CAAC,IAAI,CACN;wBACE,sBAAsB,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC/D,0BAA0B,EAAE,0BAA0B;4BACpD,CAAC,CAAC,0BAA0B,CAAC,OAAO,EAAE;4BACtC,CAAC,CAAC,CAAC;wBACL,2BAA2B,EACzB,2BAA2B,CAAC,OAAO,EAAE;wBACvC,cAAc,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC/C,mCAAmC,EACjC,mCAAmC,CAAC,aAAa,CAAC,CAAC,CAAC;qBACvD,EACD,kGAAkG,CACnG,CAAC;oBAEF,0BAA0B,GAAG,mCAAmC,CAAC;iBAClE;aACF;YAED,wCAAwC;YACxC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;YAEvE,8DAA8D;YAC9D,MAAM,uBAAuB,GAAG,aAAa;gBAC3C,CAAC,CAAC,OAAO,CAAC,WAAW;gBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAExB,IAAI,mBAAmC,CAAC;YACxC,IAAI;gBACF,mBAAmB,GAAG,uBAAuB,CAAC,KAAK,CACjD,0BAA0B,CACT,CAAC;aACrB;YAAC,OAAO,GAAG,EAAE;gBACZ,SAAG,CAAC,IAAI,CACN;oBACE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;oBAC5B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;oBAC5B,oBAAoB,EAAE,0BAA0B,CAAC,QAAQ,CAAC,MAAM;iBACjE,EACD,iCAAiC,CAClC,CAAC;gBACF,MAAM,GAAG,CAAC;aACX;YAED,wIAAwI;YACxI,IAAI,0BAA0B,KAAK,IAAI,EAAE;gBACvC,SAAG,CAAC,IAAI,CACN,kBAAkB,cAAc,CAAC,MAAM,+BAA+B,UAAU,CAAC,MAAM,sBAAsB,WAAW,CAAC,MAAM,iEAAiE,CACjM,CAAC;gBACF,OAAO;oBACL,WAAW,EAAE,UAAU;oBACvB,cAAc,EAAE,wBAAc,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;oBAC3D,YAAY,EAAE,wBAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACxD,CAAC;aACH;YAED,OAAO;gBACL,WAAW,EAAE,UAAU;gBACvB,cAAc,EAAE,0BAA0B;gBAC1C,YAAY,EAAE,mBAAoB;aACnC,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3C,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAEO,WAAW,CACjB,mBAA0C,EAC1C,WAAsB,EACtB,OAAgB;QAEhB,MAAM,4BAA4B,GAAG,qBAAS,CAAC,IAAI,CACjD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAC,CACpE,CAAC;QACF,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEzE,IAAI,UAAU,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEtD,gFAAgF;QAChF,oDAAoD;QACpD,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnB,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,IAAA,+BAAmB,EAAC,OAAO,CAAC,CAAC,CAAC;SAC3D;QAED,4EAA4E;QAC5E,4EAA4E;QAC5E,cAAc;QACd,MAAM,aAAa,GAAG,IAAA,0BAAc,EAAC,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,IAAA,8BAAkB,EAAC,OAAO,CAAC,CAAC,GAAG,CAChD,4BAA4B,CAC7B,CAAC;QACF,MAAM,uBAAuB,GAAG,gCAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE5D,kFAAkF;QAClF,MAAM,UAAU,GAAG,IAAA,0BAAc,EAAC,OAAO,CAAC;aACvC,GAAG,CAAC,UAAU,CAAC;aACf,GAAG,CAAC,aAAa,CAAC;aAClB,GAAG,CAAC,UAAU,CAAC;aACf,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAEhC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,2BAAuB,CAAC,OAAO,CAAE,CAAC;QAE1D,MAAM,0BAA0B,GAAG,wBAAc,CAAC,aAAa,CAC7D,eAAe,EACf,cAAc,CAAC,QAAQ,EAAE,CAC1B,CAAC;QAEF,OAAO;YACL,0BAA0B;YAC1B,4BAA4B;YAC5B,UAAU;SACX,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,gCAAgC,CACtC,MAA+B,EAC/B,UAAsC,EACtC,OAAwB;QAExB,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAE1D,MAAM,KAAK,GAA0B,MAAM,CAAC,CAAC,CAAE,CAAC;QAChD,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ;YACtB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAE5B,gCAAgC;QAChC,MAAM,KAAK,GAAG,IAAA,6BAAU,EAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAA,4CAAyB,EACpC,KAAK,EACL,UAAU,EACV,kBAAO,CAAC,QAAQ,CACjB,CAAC,QAAQ,CAAC;QACX,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACnD,yCAAyC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,uCAAuC;QACvC,MAAM,gBAAgB,GAAG,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9C,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAEO,gCAAgC,CACtC,MAA+B,EAC/B,UAAsC,EACtC,OAAwB;QAExB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QAEjD,MAAM,KAAK,GAA0B,MAAM,CAAC,CAAC,CAAE,CAAC;QAEhD,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ;YACtB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAE5B,gCAAgC;QAChC,MAAM,KAAK,GAAG,IAAA,6BAAU,EAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAA,4CAAyB,EACpC,KAAK,EACL,UAAU,EACV,kBAAO,CAAC,YAAY,CACrB,CAAC,QAAQ,CAAC;QACX,wEAAwE;QACxE,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,2DAA2D;QAC3D,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC5C,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACF;AA5aD,gEA4aC"}
|
|
314
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v3-heuristic-gas-model.js","sourceRoot":"","sources":["../../../../../../src/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAqD;AACrD,qDAOgC;AAEhC,oDAAuB;AAEvB,mCAIqB;AAKrB,sDAA0D;AAC1D,8EAAwE;AACxE,8CAA2C;AAC3C,wEAG2C;AAE3C,4CAKsB;AAEtB,2CAOqB;AAErB;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,0BAA2B,SAAQ,mCAAuB;IACrE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,EACzB,OAAO,EACP,WAAW,EACX,KAAK,EACL,WAAW,EACX,UAAU,EACV,iBAAiB,GACe;;QAGhC,MAAM,SAAS,GAAG,iBAAiB;YACjC,CAAC,CAAC,MAAM,iBAAiB,CAAC,UAAU,EAAE;YACtC,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,MAAM,cAAc,GAAG,2BAAuB,CAAC,OAAO,CAAE,CAAC;QACzD,MAAM,gBAAgB,GACpB,MAAA,MAAA,+BAAmB,CAAC,OAAO,CAAC,0CAAG,CAAC,CAAC,mCAAI,cAAc,CAAC;QAEtD,MAAM,kBAAkB,GAAG,KAAK,EAC9B,KAA8B,EAK7B,EAAE;YACH,MAAM,WAAW,GAA+B;gBAC9C,IAAI,EAAE,YAAQ,CAAC,gBAAgB;gBAC/B,SAAS,EAAE,4CAA4C;gBACvD,2BAA2B,EAAE,GAAG;gBAChC,iBAAiB,EAAE,IAAI,kBAAO,CAAC,CAAC,EAAE,KAAM,CAAC;aAC1C,CAAC;YACF,IAAI,MAAM,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,UAAU,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG;gBACpB,kBAAO,CAAC,QAAQ;gBAChB,kBAAO,CAAC,eAAe;gBACvB,kBAAO,CAAC,IAAI;gBACZ,kBAAO,CAAC,WAAW;aACpB,CAAC;YACF,IAAI,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACnC,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,gCAAgC,CAC1D,KAAK,EACL,WAAW,EACX,SAA4B,CAC7B,CAAC;aACH;iBAAM,IACL,OAAO,IAAI,kBAAO,CAAC,YAAY;gBAC/B,OAAO,IAAI,kBAAO,CAAC,eAAe,EAClC;gBACA,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,gCAAgC,CAC1D,KAAK,EACL,WAAW,EACX,SAA4B,CAC7B,CAAC;aACH;YAED,8BAA8B;YAC9B,MAAM,kBAAkB,GAAG,wBAAc,CAAC,aAAa,CACrD,cAAc,EACd,UAAU,CAAC,QAAQ,EAAE,CACtB,CAAC;YAEF,uBAAuB;YACvB,MAAM,YAAY,GAAmB,OAAO;gBAC1C,CAAC,CAAC,CACE,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;oBAC9C,CAAC,CAAC,OAAO,CAAC,WAAW;oBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CACxB,CAAC,KAAK,CAAC,kBAAkB,CAAC;gBAC7B,CAAC,CAAC,wBAAc,CAAC,aAAa,CAC1B,gBAAgB,EAChB,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,EAAE,CACvC,CAAC;YAEN,IAAI,mBAAmB,GAAG,kBAAkB,CAAC;YAC7C,uIAAuI;YACvI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBACtC,MAAM,UAAU,GAAgB,KAAK,CAAC,sBAAsB,CAAC;gBAC7D,IAAI,CAAC,UAAU,EAAE;oBACf,SAAG,CAAC,IAAI,CACN,gEAAgE,CACjE,CAAC;oBACF,mBAAmB,GAAG,wBAAc,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;iBACnE;qBAAM;oBACL,MAAM,gBAAgB,GACpB,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;wBACjD,CAAC,CAAC,UAAU,CAAC,WAAW;wBACxB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;oBAC7B,mBAAmB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;iBAClE;aACF;YACD,4EAA4E;YAC5E,kFAAkF;YAClF,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,YAAY;gBACZ,mBAAmB;aACpB,CAAC;QACJ,CAAC,CAAC;QAEF,kFAAkF;QAClF,gEAAgE;QAChE,qEAAqE;QACrE,MAAM,kBAAkB,GAAG,CACzB,MAAsB,EACN,EAAE;YAClB,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,wBAAc,CAAC,aAAa,CACjC,gBAAgB,EAChB,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAC3B,CAAC;aACH;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;YAChE,MAAM,gBAAgB,GAAG,MAAM;gBAC7B,CAAC,CAAC,OAAO,CAAC,WAAW;gBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YACxB,OAAO,gBAAgB,CAAC,KAAK,CAC3B,MAA8C,CAC7B,CAAC;QACtB,CAAC,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACrC,MAAM,eAAe,GAAG,CACtB,mBAA0C,EAK1C,EAAE;gBACF,MAAM,EAAE,0BAA0B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CACjE,mBAAmB,EACnB,WAAW,EACX,OAAO,CACR,CAAC;gBAEF,MAAM,mBAAmB,GAAG,kBAAkB,CAC5C,0BAA0B,CAC3B,CAAC;gBAEF,OAAO;oBACL,WAAW,EAAE,UAAU;oBACvB,cAAc,EAAE,0BAA0B;oBAC1C,YAAY,EAAE,mBAAmB;iBAClC,CAAC;YACJ,CAAC,CAAC;YAEF,OAAO;gBACL,eAAe;gBACf,kBAAkB;aACnB,CAAC;SACH;QAED,+GAA+G;QAC/G,6GAA6G;QAC7G,MAAM,UAAU,GAAgB,KAAK,CAAC,sBAAsB,CAAC;QAE7D,IAAI,gBAAgB,GAAgB,IAAI,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACvC,gBAAgB,GAAG,KAAK,CAAC,uBAAuB,CAAC;SAClD;QAED,MAAM,QAAQ,GAAG,OAAO;YACtB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO;gBAChD,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,OAAO,CAAC,MAAM;YAClB,CAAC,CAAC,gBAAgB,CAAC;QAErB,MAAM,eAAe,GAAG,CACtB,mBAA0C,EAK1C,EAAE;YACF,MAAM,EAAE,0BAA0B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CACjE,mBAAmB,EACnB,WAAW,EACX,OAAO,CACR,CAAC;YAEF,IAAI,0BAA0B,GAA0B,IAAI,CAAC;YAC7D,IAAI,UAAU,EAAE;gBACd,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBAEnE,0FAA0F;gBAC1F,MAAM,gBAAgB,GAAG,MAAM;oBAC7B,CAAC,CAAC,UAAU,CAAC,WAAW;oBACxB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;gBAE3B,IAAI;oBACF,gCAAgC;oBAChC,0BAA0B,GAAG,gBAAgB,CAAC,KAAK,CACjD,0BAA0B,CACT,CAAC;iBACrB;gBAAC,OAAO,GAAG,EAAE;oBACZ,SAAG,CAAC,IAAI,CACN;wBACE,oBAAoB,EAAE,gBAAgB,CAAC,YAAY;wBACnD,qBAAqB,EAAE,gBAAgB,CAAC,aAAa;wBACrD,YAAY,EAAE,0BAA0B,CAAC,QAAQ;qBAClD,EACD,6BAA6B,CAC9B,CAAC;oBACF,MAAM,GAAG,CAAC;iBACX;aACF;YACD,mDAAmD;iBAC9C;gBACH,SAAG,CAAC,IAAI,CACN,kBAAkB,cAAc,CAAC,MAAM,+BAA+B,UAAU,CAAC,MAAM,2EAA2E,CACnK,CAAC;aACH;YAED,uDAAuD;YACvD,uGAAuG;YACvG,IAAI,gBAAgB,EAAE;gBACpB,yDAAyD;gBACzD,MAAM,cAAc,GAAG,IAAI,gBAAK,CAC9B,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EACnC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAClC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EACnC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CACnC,CAAC;gBAEF,MAAM,aAAa,GACjB,gBAAgB,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBAC5D,0BAA0B;gBAC1B,MAAM,sBAAsB,GAAG,aAAa;oBAC1C,CAAC,CAAC,gBAAgB,CAAC,WAAW;oBAC9B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;gBAEjC,MAAM,2BAA2B,GAAG,sBAAsB,CAAC,KAAK,CAC9D,0BAA0B,CACT,CAAC;gBAEpB,2EAA2E;gBAC3E,MAAM,mCAAmC,GAAG,cAAc,CAAC,KAAK,CAC9D,2BAA2B,CAC5B,CAAC;gBAEF,wGAAwG;gBACxG,kHAAkH;gBAClH,2HAA2H;gBAC3H,IACE,0BAA0B,KAAK,IAAI;oBACnC,mCAAmC,CAAC,QAAQ,CAC1C,0BAA0B,CAAC,UAAU,CACtC,EACD;oBACA,SAAG,CAAC,IAAI,CACN;wBACE,sBAAsB,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC/D,0BAA0B,EAAE,0BAA0B;4BACpD,CAAC,CAAC,0BAA0B,CAAC,OAAO,EAAE;4BACtC,CAAC,CAAC,CAAC;wBACL,2BAA2B,EACzB,2BAA2B,CAAC,OAAO,EAAE;wBACvC,cAAc,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC/C,mCAAmC,EACjC,mCAAmC,CAAC,aAAa,CAAC,CAAC,CAAC;qBACvD,EACD,kGAAkG,CACnG,CAAC;oBAEF,0BAA0B,GAAG,mCAAmC,CAAC;iBAClE;aACF;YAED,wCAAwC;YACxC,IAAI,mBAAmC,CAAC;YACxC,IAAI,CAAC,OAAO,EAAE;gBACZ,mBAAmB,GAAG,wBAAc,CAAC,aAAa,CAChD,QAAQ,EACR,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAC/C,CAAC;aACH;iBAAM;gBACL,MAAM,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC;gBACnD,MAAM,uBAAuB,GAAG,aAAa;oBAC3C,CAAC,CAAC,OAAO,CAAC,WAAW;oBACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;gBACxB,IAAI;oBACF,mBAAmB,GAAG,uBAAuB,CAAC,KAAK,CACjD,0BAA0B,CACT,CAAC;iBACrB;gBAAC,OAAO,GAAG,EAAE;oBACZ,SAAG,CAAC,IAAI,CACN;wBACE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;wBAC5B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;wBAC5B,oBAAoB,EAClB,0BAA0B,CAAC,QAAQ,CAAC,MAAM;qBAC7C,EACD,iCAAiC,CAClC,CAAC;oBACF,MAAM,GAAG,CAAC;iBACX;aACF;YAED,wIAAwI;YACxI,IAAI,0BAA0B,KAAK,IAAI,EAAE;gBACvC,SAAG,CAAC,IAAI,CACN,kBAAkB,cAAc,CAAC,MAAM,+BAA+B,UAAU,CAAC,MAAM,sBAAsB,WAAW,CAAC,MAAM,iEAAiE,CACjM,CAAC;gBACF,OAAO;oBACL,WAAW,EAAE,UAAU;oBACvB,cAAc,EAAE,wBAAc,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;oBAC3D,YAAY,EAAE,wBAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACxD,CAAC;aACH;YAED,OAAO;gBACL,WAAW,EAAE,UAAU;gBACvB,cAAc,EAAE,0BAA0B;gBAC1C,YAAY,EAAE,mBAAoB;aACnC,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3C,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAEO,WAAW,CACjB,mBAA0C,EAC1C,WAAsB,EACtB,OAAgB;QAEhB,MAAM,4BAA4B,GAAG,qBAAS,CAAC,IAAI,CACjD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAC,CACpE,CAAC;QACF,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEzE,IAAI,UAAU,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEtD,gFAAgF;QAChF,oDAAoD;QACpD,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnB,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,IAAA,+BAAmB,EAAC,OAAO,CAAC,CAAC,CAAC;SAC3D;QAED,4EAA4E;QAC5E,4EAA4E;QAC5E,cAAc;QACd,MAAM,aAAa,GAAG,IAAA,0BAAc,EAAC,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,IAAA,8BAAkB,EAAC,OAAO,CAAC,CAAC,GAAG,CAChD,4BAA4B,CAC7B,CAAC;QACF,MAAM,uBAAuB,GAAG,gCAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE5D,kFAAkF;QAClF,MAAM,UAAU,GAAG,IAAA,0BAAc,EAAC,OAAO,CAAC;aACvC,GAAG,CAAC,UAAU,CAAC;aACf,GAAG,CAAC,aAAa,CAAC;aAClB,GAAG,CAAC,UAAU,CAAC;aACf,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAEhC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,2BAAuB,CAAC,OAAO,CAAE,CAAC;QAE1D,MAAM,0BAA0B,GAAG,wBAAc,CAAC,aAAa,CAC7D,eAAe,EACf,cAAc,CAAC,QAAQ,EAAE,CAC1B,CAAC;QAEF,OAAO;YACL,0BAA0B;YAC1B,4BAA4B;YAC5B,UAAU;SACX,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,gCAAgC,CACtC,MAA+B,EAC/B,UAAsC,EACtC,OAAwB;QAExB,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAE1D,MAAM,KAAK,GAA0B,MAAM,CAAC,CAAC,CAAE,CAAC;QAChD,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ;YACtB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAE5B,gCAAgC;QAChC,MAAM,KAAK,GAAG,IAAA,6BAAU,EAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAA,4CAAyB,EACpC,KAAK,EACL,UAAU,EACV,kBAAO,CAAC,QAAQ,CACjB,CAAC,QAAQ,CAAC;QACX,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACnD,yCAAyC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,uCAAuC;QACvC,MAAM,gBAAgB,GAAG,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9C,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAEO,gCAAgC,CACtC,MAA+B,EAC/B,UAAsC,EACtC,OAAwB;QAExB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;QAEjD,MAAM,KAAK,GAA0B,MAAM,CAAC,CAAC,CAAE,CAAC;QAEhD,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,MAAM,WAAW,GACf,KAAK,CAAC,SAAS,IAAI,oBAAS,CAAC,WAAW;YACtC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ;YACtB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QAE5B,gCAAgC;QAChC,MAAM,KAAK,GAAG,IAAA,6BAAU,EAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,IAAA,4CAAyB,EACpC,KAAK,EACL,UAAU,EACV,kBAAO,CAAC,YAAY,CACrB,CAAC,QAAQ,CAAC;QACX,wEAAwE;QACxE,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,IAAI,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,2DAA2D;QAC3D,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC5C,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACF;AAlcD,gEAkcC"}
|