@clober/v2-sdk 1.0.0-rc.49 → 1.0.0-rc.50
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/dist/cjs/calls/pool/mint.js +5 -2
- package/dist/cjs/calls/pool/mint.js.map +1 -1
- package/dist/esm/calls/pool/mint.js +6 -2
- package/dist/esm/calls/pool/mint.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/calls/pool/mint.d.ts +1 -0
- package/dist/types/calls/pool/mint.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -13,8 +13,8 @@ const minter_abi_1 = require("../../constants/abis/rebalancer/minter-abi");
|
|
|
13
13
|
const math_1 = require("../../utils/math");
|
|
14
14
|
const order_id_1 = require("../../entities/open-order/utils/order-id");
|
|
15
15
|
const utils_1 = require("../../utils");
|
|
16
|
-
const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimitPercent, gasPrice, userAddress, }) => {
|
|
17
|
-
const results = (await Promise.allSettled((quotes ?? []).map(async (quote) => quote(tokenIn, amountIn, tokenOut, slippageLimitPercent, gasPrice, userAddress))))
|
|
16
|
+
const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimitPercent, gasPrice, userAddress, timeout = 4000, }) => {
|
|
17
|
+
const results = (await Promise.allSettled((quotes ?? []).map(async (quote) => quote(tokenIn, amountIn, tokenOut, slippageLimitPercent, gasPrice, userAddress, timeout))))
|
|
18
18
|
.map((result) => (result.status === 'fulfilled' ? result.value : undefined))
|
|
19
19
|
.filter((quote) => quote !== undefined && quote.amountOut > 0n)
|
|
20
20
|
.sort((a, b) => Number(b.amountOut - a.amountOut));
|
|
@@ -73,6 +73,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
73
73
|
disableSwap = true;
|
|
74
74
|
}
|
|
75
75
|
const slippageLimitPercent = options?.slippage ?? 1.0;
|
|
76
|
+
const timeoutForQuotes = options?.timeoutForQuotes ?? 4000;
|
|
76
77
|
const swapParams = {
|
|
77
78
|
inCurrency: viem_1.zeroAddress,
|
|
78
79
|
amount: 0n,
|
|
@@ -117,6 +118,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
117
118
|
slippageLimitPercent,
|
|
118
119
|
gasPrice,
|
|
119
120
|
userAddress,
|
|
121
|
+
timeout: timeoutForQuotes,
|
|
120
122
|
});
|
|
121
123
|
swapParams.data = transaction.data;
|
|
122
124
|
amountA += deltaA;
|
|
@@ -133,6 +135,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
133
135
|
slippageLimitPercent,
|
|
134
136
|
gasPrice,
|
|
135
137
|
userAddress,
|
|
138
|
+
timeout: timeoutForQuotes,
|
|
136
139
|
});
|
|
137
140
|
swapParams.data = transaction.data;
|
|
138
141
|
amountA += actualDeltaA;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AAEb,+DAA0E;AAS1E,mDAAoD;AACpD,mDAAkE;AAClE,yDAIuC;AACvC,+CAAiD;AACjD,qEAAgE;AAChE,uEAA4E;AAC5E,2EAAuE;AACvE,2CAAsC;AACtC,uEAAsE;AACtE,uCAA8D;AAE9D,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,
|
|
1
|
+
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,9 @@ import { MINTER_ABI } from '../../constants/abis/rebalancer/minter-abi';
|
|
|
10
10
|
import { abs } from '../../utils/math';
|
|
11
11
|
import { fromOrderId } from '../../entities/open-order/utils/order-id';
|
|
12
12
|
import { formatPrice, invertTick, toPrice } from '../../utils';
|
|
13
|
-
const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimitPercent, gasPrice, userAddress,
|
|
14
|
-
|
|
13
|
+
const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimitPercent, gasPrice, userAddress, timeout = 4000, // Default timeout of 4 seconds
|
|
14
|
+
}) => {
|
|
15
|
+
const results = (await Promise.allSettled((quotes ?? []).map(async (quote) => quote(tokenIn, amountIn, tokenOut, slippageLimitPercent, gasPrice, userAddress, timeout))))
|
|
15
16
|
.map((result) => (result.status === 'fulfilled' ? result.value : undefined))
|
|
16
17
|
.filter((quote) => quote !== undefined && quote.amountOut > 0n)
|
|
17
18
|
.sort((a, b) => Number(b.amountOut - a.amountOut));
|
|
@@ -70,6 +71,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
70
71
|
disableSwap = true;
|
|
71
72
|
}
|
|
72
73
|
const slippageLimitPercent = options?.slippage ?? 1.0;
|
|
74
|
+
const timeoutForQuotes = options?.timeoutForQuotes ?? 4000; // Default timeout of 4 seconds
|
|
73
75
|
const swapParams = {
|
|
74
76
|
inCurrency: zeroAddress,
|
|
75
77
|
amount: 0n,
|
|
@@ -114,6 +116,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
114
116
|
slippageLimitPercent,
|
|
115
117
|
gasPrice,
|
|
116
118
|
userAddress,
|
|
119
|
+
timeout: timeoutForQuotes,
|
|
117
120
|
});
|
|
118
121
|
swapParams.data = transaction.data;
|
|
119
122
|
amountA += deltaA;
|
|
@@ -130,6 +133,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
130
133
|
slippageLimitPercent,
|
|
131
134
|
gasPrice,
|
|
132
135
|
userAddress,
|
|
136
|
+
timeout: timeoutForQuotes,
|
|
133
137
|
});
|
|
134
138
|
swapParams.data = transaction.data;
|
|
135
139
|
amountA += actualDeltaA;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,GACZ,MAAM,MAAM,CAAA;AAEb,OAAO,EAAa,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAS1E,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,wBAAwB,GACzB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE9D,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,
|
|
1
|
+
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,GACZ,MAAM,MAAM,CAAA;AAEb,OAAO,EAAa,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAS1E,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,wBAAwB,GACzB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE9D,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,EACX,OAAO,GAAG,IAAI,EAAE,+BAA+B;EAqBhD,EAA4D,EAAE;IAC7D,MAAM,OAAO,GAAG,CACd,MAAM,OAAO,CAAC,UAAU,CACtB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CACjC,KAAK,CACH,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,EACX,OAAO,CACR,CACF,CACF,CACF;SACE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;SAC3E,MAAM,CACL,CACE,KAAK,EAIL,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,GAAG,EAAE,CACjD;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IAEpD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IACD,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;IACD,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IACD,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;QAC/B,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW;KACpC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,OAAO,EACP,WAAW,EACX,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,OAAO,GA4BR,EAOE,EAAE;IACH,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;QACzB,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;KAC3D,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,MAAM,SAAS,CAC1B,YAAY,EACZ,OAAO,EACP,CAAC,MAAM,EAAE,MAAM,CAAC,EAChB,IAAI,EACJ,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CACnC,CAAA;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC;;;;;uBAKG,OAAO;uBACP,MAAM;uBACN,MAAM;;;KAGxB,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,cAAc,CACnD,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,UAAU,CAAC,MAAM,CAAC,CACnB;QACC,CAAC,CAAC;YACE,UAAU,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACnD,UAAU,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SACpD;QACH,CAAC,CAAC;YACE,UAAU,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACnD,UAAU,CAAC,OAAO,IAAI,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SACpD,CAAA;IACL,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;IACvD,MAAM,kBAAkB,GAAG,cAAc,CACvC,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,UAAU,CAAC,MAAM,CAAC,CACnB;QACC,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB;QAC1D,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,CAAA;IAC5D,MAAM,kBAAkB,GAAG,cAAc,CACvC,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,UAAU,CAAC,MAAM,CAAC,CACnB;QACC,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB;QAC1D,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,CAAA;IAC5D,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAA;IACpD,IACE,IAAI,CAAC,WAAW,KAAK,EAAE;QACvB,CAAC,IAAI,CAAC,UAAU,KAAK,EAAE,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,EAClD,CAAC;QACD,WAAW,GAAG,IAAI,CAAA;IACpB,CAAC;IACD,MAAM,oBAAoB,GAAG,OAAO,EAAE,QAAQ,IAAI,GAAG,CAAA;IACrD,MAAM,gBAAgB,GAAG,OAAO,EAAE,gBAAgB,IAAI,IAAI,CAAA,CAAC,+BAA+B;IAE1F,MAAM,UAAU,GAIZ;QACF,UAAU,EAAE,WAAW;QACvB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,IAAI;KACX,CAAA;IAED,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IACE,CAAC,CACC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;YACjE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CACjE,EACD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;QACH,CAAC;QAED,IAAI,WAAW,GACb,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,MAAM,CACJ,WAAW,CACT,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAC1B,CACF;YACH,CAAC,CAAC,CAAC,CAAA;QACP,IAAI,WAAW,GACb,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,MAAM,CACJ,WAAW,CACT,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EACjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAC1B,CACF;YACH,CAAC,CAAC,CAAC,CAAA;QACP,IAAI,WAAW,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAChE,CAAC;aAAM,IAAI,WAAW,KAAK,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YAChD,WAAW,GAAG,WAAW,CAAA;QAC3B,CAAC;aAAM,IAAI,WAAW,GAAG,CAAC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YAChD,WAAW,GAAG,WAAW,CAAA;QAC3B,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;QAE7C,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC5D,MAAM,WAAW,GAAG,wBAAwB,CAC1C,WAAW,EACX,CAAC,EACD,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,QAAQ,EACvB,IAAI,CAAC,SAAS,CAAC,QAAQ,CACxB,CAAA;QACD,IAAI,WAAW,KAAK,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CACtC,OAAO,EACP,OAAO,EACP,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,EACf,WAAW,EACX,WAAW,CACZ,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,CAAA;QACjD,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC;YAChB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAA;YAC9C,UAAU,CAAC,MAAM,GAAG,CAAC,MAAM,CAAA;YAE3B,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,YAAY,CAAC;gBAClE,MAAM,EAAE,MAAM,IAAI,EAAE;gBACpB,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,QAAQ,EAAE,UAAU,CAAC,MAAM;gBAC3B,oBAAoB;gBACpB,QAAQ;gBACR,WAAW;gBACX,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAA;YAEF,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;YAClC,OAAO,IAAI,MAAM,CAAA;YACjB,OAAO,IAAI,YAAY,CAAA;QACzB,CAAC;aAAM,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC;YACvB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAA;YAC9C,UAAU,CAAC,MAAM,GAAG,CAAC,MAAM,CAAA;YAE3B,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,YAAY,CAAC;gBAClE,MAAM,EAAE,MAAM,IAAI,EAAE;gBACpB,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,QAAQ,EAAE,UAAU,CAAC,MAAM;gBAC3B,oBAAoB;gBACpB,QAAQ;gBACR,WAAW;gBACX,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAA;YAEF,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;YAClC,OAAO,IAAI,YAAY,CAAA;YACvB,OAAO,IAAI,MAAM,CAAA;QACnB,CAAC;IACH,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,qBAAqB,CAChE,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,EACf,OAAO,EACP,OAAO,EACP,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,SAAS,CACf,CAAA;IAED,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACtB,OAAO;YACL,WAAW,EAAE,SAAS;YACtB,MAAM,EAAE;gBACN,SAAS,EAAE;oBACT,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,IAAI;iBAChB;gBACD,SAAS,EAAE;oBACT,QAAQ,EAAE,IAAI,CAAC,SAAS;oBACxB,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,IAAI;iBAChB;gBACD,UAAU,EAAE;oBACV,QAAQ,EAAE,IAAI,CAAC,UAAU;oBACzB,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,KAAK;iBACjB;aACF;SACF,CAAA;IACH,CAAC;IAED,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAA;IAE1E,MAAM,WAAW,GAAG,MAAM,gBAAgB,CACxC,YAAY,EACZ;QACE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;QACzB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAE,CAAC,MAAM;QAC5C,GAAG,EAAE,UAAU;QACf,YAAY,EAAE,MAAM;QACpB,IAAI,EAAE;YACJ,IAAI,CAAC,GAAG;YACR,aAAa;YACb,aAAa;YACb,aAAa;YACb;gBACE,YAAY,EAAE,kBAAkB,CAAC,YAAY;gBAC7C,SAAS,EAAE,kBAAkB,CAAC,SAAS;aACxC;YACD;gBACE,YAAY,EAAE,kBAAkB,CAAC,YAAY;gBAC7C,SAAS,EAAE,kBAAkB,CAAC,SAAS;aACxC;YACD,UAAU;SACX;QACD,KAAK,EAAE,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;YACxC,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;gBACnC,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,SAAS;KAChB,EACD,OAAO,EAAE,QAAQ,CAClB,CAAA;IAED,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,CAAA;IAC3C,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,CAAA;IAC3C,MAAM,qBAAqB,GAAG,aAAa,GAAG,eAAe,CAAA;IAC7D,MAAM,qBAAqB,GAAG,aAAa,GAAG,eAAe,CAAA;IAE7D,OAAO;QACL,WAAW;QACX,MAAM,EAAE;YACN,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,MAAM,EAAE,WAAW,CACjB,GAAG,CAAC,qBAAqB,CAAC,EAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,CACxB;gBACD,SAAS,EAAE,qBAAqB,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;aACrD;YACD,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,MAAM,EAAE,WAAW,CACjB,GAAG,CAAC,qBAAqB,CAAC,EAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,CACxB;gBACD,SAAS,EAAE,qBAAqB,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;aACrD;YACD,UAAU,EAAE;gBACV,QAAQ,EAAE,IAAI,CAAC,UAAU;gBACzB,MAAM,EAAE,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACzD,SAAS,EAAE,KAAK;aACjB;SACF;KACF,CAAA;AACH,CAAC,CAAA"}
|