curvance 5.0.0 → 5.1.1

package/README.md

@@ -35,7 +35,6 @@ const { markets, reader, dexAgg, global_milestone } = await setupChain("monad-ma
 setupChain(
     chain: ChainRpcPrefix,
     provider: curvance_provider | null = null,   // signer (wallet) OR read-only provider; null → SDK default
-    approval_protection: boolean = false,         // revoke-before-approve pattern
     api_url: string = "https://api.curvance.com",
     options: {
         feePolicy?: FeePolicy;                    // zap/leverage fee routing (default: NO_FEE_POLICY)
@@ -57,6 +56,13 @@ setupChain(
 - **Explicit `options.readProvider`** → wins over all of the above. Use when you want deterministic read transport (e.g. fork testing).
 - **Writes** always route through the connected signer; they never use the chain RPC or fallbacks.
 
+### Write approvals
+
+- High-level write methods always preflight the approvals they need before submit.
+- Missing ERC20 allowance throws a descriptive error instead of sending a revert-prone transaction.
+- Missing zapper or position-manager delegate approval also throws before submit.
+- There is no setup-time approval mode switch. Use `approveUnderlying`, `approveZapAsset`, and `approvePlugin` explicitly when the caller needs to satisfy approvals.
+
 ### Explore markets
 
 ```ts
@@ -222,6 +228,7 @@ token.getMaxBorrowable()             // max amount given credit
 ```ts
 token.getSnapshot(account)                // position snapshot for an account
 token.maxRedemption(inShares, bufferTime) // max redeemable amount
+token.maxRemovableCollateral(inShares, bufferTime) // max posted collateral removable without violating health
 token.simulateDeposit(amount)             // preview deposit without executing
 token.simulateDepositAsCollateral(amount)
 ```
@@ -254,7 +261,8 @@ await token.redeemCollateral(amount, receiver?, owner?)
 
 // Manage posted collateral
 await token.postCollateral(amount)   // post unposted balance as collateral
-await token.removeCollateral(amount, removeAll?)
+await token.removeCollateralExact(amount) // exact collateral removal, capped to the safe removable max
+await token.removeMaxCollateral()         // remove the maximum valid posted collateral
 ```
 
 ### Borrow & Repay (`BorrowableCToken` only)
@@ -292,6 +300,7 @@ if (!approved) await token.approvePlugin('simple', 'zapper')
 // Plugin types
 // ZapperTypes:          'none' | 'native-vault' | 'vault' | 'simple' | 'native-simple'
 // PositionManagerTypes: 'native-vault' | 'simple' | 'vault'
+// `leverageDown(...)` currently executes through the 'simple' position manager only.
 
 const zapper = token.getZapper('simple')
 const positionManager = token.getPositionManager('simple')
@@ -338,6 +347,7 @@ await collateralToken.depositAsCollateral(amount)
 await collateralToken.leverageUp(borrowToken, new Decimal(3), 'simple', new Decimal(0.005))
 
 // Reduce leverage
+// Deleverage currently executes through the simple position manager path.
 await collateralToken.leverageDown(borrowToken, currentLeverage, targetLeverage, 'simple', slippage)
 
 // Check current leverage
@@ -522,7 +532,7 @@ const feePolicy = flatFeePolicy({
     stableToStableBps: 2n,             // optional lower fee for stable↔stable swaps
 })
 
-const { markets } = await setupChain("monad-mainnet", wallet, false, undefined, { feePolicy })
+const { markets } = await setupChain("monad-mainnet", wallet, undefined, { feePolicy })
 ```
 
 The SDK automatically returns 0 bps for native ↔ wrapped-native swaps and same-token no-op zaps.
@@ -575,6 +585,8 @@ const snapshot = await takePortfolioSnapshot(account)
 const marketSnapshot = snapshotMarket(market)
 ```
 
+`snapshotMarket(...)` requires full user token data. `takePortfolioSnapshot(...)` will automatically promote summary-scoped markets back to full user data before reading token balances. If you previously called `refreshActiveUserMarketSummaries(...)` and need a direct single-market snapshot, run `market.reloadUserData(account)` or `Market.reloadUserMarkets(...)` first.
+
 ## ❯ Optimizer
 
 The `OptimizerReader` reads yield-rebalancing vaults that allocate across markets.
@@ -582,7 +594,10 @@ The `OptimizerReader` reads yield-rebalancing vaults that allocate across market
 ```ts
 import { OptimizerReader } from "curvance"
 
-const optimizer = new OptimizerReader(provider)
+const optimizer = new OptimizerReader(optimizerReaderAddress, provider)
+
+await optimizer.getOptimizerAPY(optimizerAddress)
+// Returns: weighted-average optimizer APY in WAD
 
 await optimizer.getOptimizerMarketData(optimizerAddresses)
 // Returns: { totalAssets, sharePrice, performanceFee, markets[] }
@@ -590,9 +605,8 @@ await optimizer.getOptimizerMarketData(optimizerAddresses)
 await optimizer.getOptimizerUserData(optimizerAddresses, account)
 // Returns: user balance and redeemable amounts
 
-await optimizer.optimalDeposit(optimizer, assets)    // best market to deposit into
-await optimizer.optimalWithdrawal(optimizer, assets) // best market to withdraw from
-await optimizer.optimalRebalance(optimizer)          // suggested reallocations: { cToken, assets }[]
+await optimizer.optimalRebalance(optimizer, 100n)
+// Returns: { actions: { cToken, assetsOrBps }[], bounds: { cToken, minBps, maxBps }[] }
 ```
 
 ## ❯ TypeScript Types
@@ -617,6 +631,7 @@ type CollateralSource = "Renzo" | "Upshift" | "Yuzu" | "Native" | "Circle" | "Fa
 // Operations
 type ZapperTypes = 'none' | 'native-vault' | 'vault' | 'simple' | 'native-simple'
 type PositionManagerTypes = 'native-vault' | 'simple' | 'vault'
+// `leverageDown(...)` accepts 'simple' only.
 type ChangeRate = 'year' | 'month' | 'week' | 'day'
 
 // DEX

package/dist/abis/OptimizerReader.json

@@ -1,4 +1,23 @@
 [
+    {
+        "type": "function",
+        "name": "getOptimizerAPY",
+        "inputs": [
+            {
+                "name": "optimizer",
+                "type": "address",
+                "internalType": "address"
+            }
+        ],
+        "outputs": [
+            {
+                "name": "apy",
+                "type": "uint256",
+                "internalType": "uint256"
+            }
+        ],
+        "stateMutability": "view"
+    },
     {
         "type": "function",
         "name": "getOptimizerMarketData",
@@ -70,7 +89,7 @@
                 ]
             }
         ],
-        "stateMutability": "view"
+        "stateMutability": "nonpayable"
     },
     {
         "type": "function",
@@ -115,7 +134,7 @@
     },
     {
         "type": "function",
-        "name": "optimalDeposit",
+        "name": "optimalRebalance",
         "inputs": [
             {
                 "name": "optimizer",
@@ -123,30 +142,11 @@
                 "internalType": "address"
             },
             {
-                "name": "assets",
+                "name": "slippageBps",
                 "type": "uint256",
                 "internalType": "uint256"
             }
         ],
-        "outputs": [
-            {
-                "name": "market",
-                "type": "address",
-                "internalType": "address"
-            }
-        ],
-        "stateMutability": "view"
-    },
-    {
-        "type": "function",
-        "name": "optimalRebalance",
-        "inputs": [
-            {
-                "name": "optimizer",
-                "type": "address",
-                "internalType": "address"
-            }
-        ],
         "outputs": [
             {
                 "name": "actions",
@@ -159,35 +159,33 @@
                         "internalType": "contract IBorrowableCToken"
                     },
                     {
-                        "name": "assets",
+                        "name": "assetsOrBps",
                         "type": "int256",
                         "internalType": "int256"
                     }
                 ]
-            }
-        ],
-        "stateMutability": "view"
-    },
-    {
-        "type": "function",
-        "name": "optimalWithdrawal",
-        "inputs": [
-            {
-                "name": "optimizer",
-                "type": "address",
-                "internalType": "address"
             },
             {
-                "name": "assets",
-                "type": "uint256",
-                "internalType": "uint256"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "market",
-                "type": "address",
-                "internalType": "address"
+                "name": "bounds",
+                "type": "tuple[]",
+                "internalType": "struct LendingOptimizer.AllocationBound[]",
+                "components": [
+                    {
+                        "name": "cToken",
+                        "type": "address",
+                        "internalType": "address"
+                    },
+                    {
+                        "name": "minBps",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "maxBps",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    }
+                ]
             }
         ],
         "stateMutability": "view"

package/dist/abis/ProtocolReader.json

@@ -336,6 +336,108 @@
         ],
         "stateMutability": "view"
     },
+    {
+        "type": "function",
+        "name": "getDynamicMarketData",
+        "inputs": [],
+        "outputs": [
+            {
+                "name": "data",
+                "type": "tuple[]",
+                "internalType": "struct ProtocolReader.DynamicMarketData[]",
+                "components": [
+                    {
+                        "name": "_address",
+                        "type": "address",
+                        "internalType": "address"
+                    },
+                    {
+                        "name": "tokens",
+                        "type": "tuple[]",
+                        "internalType": "struct ProtocolReader.DynamicMarketToken[]",
+                        "components": [
+                            {
+                                "name": "_address",
+                                "type": "address",
+                                "internalType": "address"
+                            },
+                            {
+                                "name": "totalSupply",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "exchangeRate",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "totalAssets",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "collateral",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "debt",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "sharePrice",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "assetPrice",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "sharePriceLower",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "assetPriceLower",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "borrowRate",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "predictedBorrowRate",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "utilizationRate",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "supplyRate",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "liquidity",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "stateMutability": "view"
+    },
     {
         "type": "function",
         "name": "getLeverageSnapshot",
@@ -402,11 +504,56 @@
     },
     {
         "type": "function",
-        "name": "getDynamicMarketData",
-        "inputs": [],
+        "name": "getLiquidationPrice",
+        "inputs": [
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "cToken",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "long",
+                "type": "bool",
+                "internalType": "bool"
+            }
+        ],
         "outputs": [
             {
-                "name": "data",
+                "name": "price",
+                "type": "uint256",
+                "internalType": "uint256"
+            },
+            {
+                "name": "errorHit",
+                "type": "bool",
+                "internalType": "bool"
+            }
+        ],
+        "stateMutability": "view"
+    },
+    {
+        "type": "function",
+        "name": "getMarketStates",
+        "inputs": [
+            {
+                "name": "markets",
+                "type": "address[]",
+                "internalType": "address[]"
+            },
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            }
+        ],
+        "outputs": [
+            {
+                "name": "dynamicMarkets",
                 "type": "tuple[]",
                 "internalType": "struct ProtocolReader.DynamicMarketData[]",
                 "components": [
@@ -498,40 +645,151 @@
                         ]
                     }
                 ]
+            },
+            {
+                "name": "userMarkets",
+                "type": "tuple[]",
+                "internalType": "struct ProtocolReader.UserMarket[]",
+                "components": [
+                    {
+                        "name": "_address",
+                        "type": "address",
+                        "internalType": "address"
+                    },
+                    {
+                        "name": "collateral",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "maxDebt",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "debt",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "positionHealth",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "cooldown",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "errorCodeHit",
+                        "type": "bool",
+                        "internalType": "bool"
+                    },
+                    {
+                        "name": "tokens",
+                        "type": "tuple[]",
+                        "internalType": "struct ProtocolReader.UserMarketToken[]",
+                        "components": [
+                            {
+                                "name": "_address",
+                                "type": "address",
+                                "internalType": "address"
+                            },
+                            {
+                                "name": "userAssetBalance",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "userShareBalance",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "userUnderlyingBalance",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "userCollateral",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "userDebt",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            },
+                            {
+                                "name": "liquidationPrice",
+                                "type": "uint256",
+                                "internalType": "uint256"
+                            }
+                        ]
+                    }
+                ]
             }
         ],
         "stateMutability": "view"
     },
     {
         "type": "function",
-        "name": "getLiquidationPrice",
+        "name": "getMarketSummaries",
         "inputs": [
             {
-                "name": "account",
-                "type": "address",
-                "internalType": "address"
+                "name": "markets",
+                "type": "address[]",
+                "internalType": "address[]"
             },
             {
-                "name": "cToken",
+                "name": "account",
                 "type": "address",
                 "internalType": "address"
-            },
-            {
-                "name": "long",
-                "type": "bool",
-                "internalType": "bool"
             }
         ],
         "outputs": [
             {
-                "name": "price",
-                "type": "uint256",
-                "internalType": "uint256"
-            },
-            {
-                "name": "errorHit",
-                "type": "bool",
-                "internalType": "bool"
+                "name": "userMarkets",
+                "type": "tuple[]",
+                "internalType": "struct ProtocolReader.UserMarketSummary[]",
+                "components": [
+                    {
+                        "name": "_address",
+                        "type": "address",
+                        "internalType": "address"
+                    },
+                    {
+                        "name": "collateral",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "maxDebt",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "debt",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "positionHealth",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "cooldown",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "errorCodeHit",
+                        "type": "bool",
+                        "internalType": "bool"
+                    }
+                ]
             }
         ],
         "stateMutability": "view"
@@ -634,40 +892,6 @@
         ],
         "stateMutability": "view"
     },
-    {
-        "type": "function",
-        "name": "getPriceSafely",
-        "inputs": [
-            {
-                "name": "asset",
-                "type": "address",
-                "internalType": "address"
-            },
-            {
-                "name": "inUSD",
-                "type": "bool",
-                "internalType": "bool"
-            },
-            {
-                "name": "getLower",
-                "type": "bool",
-                "internalType": "bool"
-            },
-            {
-                "name": "errorCodeBreakpoint",
-                "type": "uint256",
-                "internalType": "uint256"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256",
-                "internalType": "uint256"
-            }
-        ],
-        "stateMutability": "view"
-    },
     {
         "type": "function",
         "name": "getStaticMarketData",

package/dist/chains/arbitrum.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testnet = void 0;
-const KyberSwap_1 = require("../classes/DexAggregators/KyberSwap");
+const UnsupportedDexAgg_1 = require("../classes/DexAggregators/UnsupportedDexAgg");
 const rpc_1 = require("./rpc");
 exports.testnet = {
     chainId: 421614,
-    dexAgg: new KyberSwap_1.KyberSwap(),
+    dexAgg: new UnsupportedDexAgg_1.UnsupportedDexAgg("arb-sepolia"),
     rpc: (0, rpc_1.getChainRpcConfig)("arb-sepolia"),
     provider: (0, rpc_1.createChainPrimaryProvider)("arb-sepolia"),
     fallbackProviders: (0, rpc_1.createChainFallbackProviders)("arb-sepolia"),
     native_symbol: 'ETH',
     native_name: 'Ether',
-    wrapped_native: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
+    wrapped_native: '0x980B62Da83eFf3D4576C647993b0c1D7faf17c73',
     native_vaults: [],
     vaults: []
 };

package/dist/chains/arbitrum.js.map

@@ -1 +1 @@
-{"version":3,"file":"arbitrum.js","sourceRoot":"","sources":["../../src/chains/arbitrum.ts"],"names":[],"mappings":";;;AACA,mEAAgE;AAEhE,+BAAoG;AAEvF,QAAA,OAAO,GAAgB;IAChC,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,IAAI,qBAAS,EAAE;IACvB,GAAG,EAAE,IAAA,uBAAiB,EAAC,aAAa,CAAC;IACrC,QAAQ,EAAE,IAAA,gCAA0B,EAAC,aAAa,CAAC;IACnD,iBAAiB,EAAE,IAAA,kCAA4B,EAAC,aAAa,CAAC;IAC9D,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,OAAO;IACpB,cAAc,EAAE,4CAAuD;IACvE,aAAa,EAAE,EAAE;IACjB,MAAM,EAAE,EAAE;CACb,CAAA"}
+{"version":3,"file":"arbitrum.js","sourceRoot":"","sources":["../../src/chains/arbitrum.ts"],"names":[],"mappings":";;;AACA,mFAAgF;AAEhF,+BAAoG;AAEvF,QAAA,OAAO,GAAgB;IAChC,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,IAAI,qCAAiB,CAAC,aAAa,CAAC;IAC5C,GAAG,EAAE,IAAA,uBAAiB,EAAC,aAAa,CAAC;IACrC,QAAQ,EAAE,IAAA,gCAA0B,EAAC,aAAa,CAAC;IACnD,iBAAiB,EAAE,IAAA,kCAA4B,EAAC,aAAa,CAAC;IAC9D,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,OAAO;IACpB,cAAc,EAAE,4CAAuD;IACvE,aAAa,EAAE,EAAE;IACjB,MAAM,EAAE,EAAE;CACb,CAAA"}

package/dist/classes/Api.d.ts

@@ -1,4 +1,4 @@
-import { type SetupConfigSnapshot } from "../setup";
+import type { SetupConfigSnapshot } from "../setup";
 import { address } from "../types";
 export type IncentiveResponse = {
     market: address;
@@ -21,7 +21,7 @@ export type Milestones = {
     [key: string]: MilestoneResponse;
 };
 export type Incentives = {
-    [key: address]: Array<IncentiveResponse>;
+    [key: string]: Array<IncentiveResponse>;
 };
 export declare class Api {
     private url;

package/dist/classes/Api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/classes/Api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAA;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAA;AACD,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAA;CAAE,CAAC;AAGtE,qBAAa,GAAG;IACZ,OAAO,CAAC,GAAG,CAAS;gBAED,MAAM,GAAE,mBAAkC;WAIhD,iBAAiB,CAAC,MAAM,GAAE,mBAAkC,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;WAuCzG,UAAU,CAAC,MAAM,GAAE,mBAAkC;;;;CAmCrE"}
+{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/classes/Api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAA;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,CAAA;AACD,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAA;CAAE,CAAC;AA2FrE,qBAAa,GAAG;IACZ,OAAO,CAAC,GAAG,CAAS;gBAED,MAAM,CAAC,EAAE,mBAAmB;WAIlC,iBAAiB,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;WA4C3F,UAAU,CAAC,MAAM,CAAC,EAAE,mBAAmB;;;;CA0CvD"}