@paraswap/dex-lib 2.19.1 → 2.20.0

package/src/router/directswap.ts

@@ -3,6 +3,11 @@ import { IDex } from '../dex/idex';
 import { Address, OptimalRate, TxInfo, Adapters } from '../types';
 import { SwapSide } from '../constants';
 import { DexAdapterService } from '../dex';
+import { assert } from 'ts-essentials';
+import {
+  encodeFeePercent,
+  encodeFeePercentForReferrer,
+} from './payload-encoder';
 
 export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
   // This is just psuedo name as the DirectSwap
@@ -51,6 +56,7 @@ export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
       );
 
     const swapExchange = priceRoute.bestRoute[0].swaps[0].swapExchanges[0];
+
     const srcAmount =
       priceRoute.side === SwapSide.SELL ? swapExchange.srcAmount : minMaxAmount;
     const destAmount =
@@ -58,14 +64,31 @@ export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
         ? minMaxAmount
         : swapExchange.destAmount;
 
+    const expectedAmount =
+      priceRoute.side === SwapSide.SELL
+        ? priceRoute.destAmount
+        : priceRoute.srcAmount;
+
     return dex.getDirectParam!(
       priceRoute.srcToken,
       priceRoute.destToken,
       srcAmount,
       destAmount,
+      expectedAmount,
       swapExchange.data,
       priceRoute.side,
       permit,
+      uuid,
+      referrerAddress
+        ? encodeFeePercentForReferrer(priceRoute.side)
+        : encodeFeePercent(
+            partnerFeePercent,
+            positiveSlippageToUser,
+            priceRoute.side,
+          ),
+      deadline,
+      referrerAddress || partnerAddress,
+      beneficiary,
       priceRoute.contractMethod,
     );
   }

package/src/router/index.ts

@@ -5,9 +5,7 @@ import { Buy } from './buy';
 import { SimpleSwap, SimpleBuy } from './simpleswap';
 import { SimpleBuyNFT } from './simpleswapnft';
 import { DirectSwap } from './directswap';
-import { Adapters } from '../types';
 import { DexAdapterService } from '../dex';
-import { SwapSide } from '../constants';
 
 export class RouterService {
   hybridRouters = [

package/src/router/payload-encoder.ts

@@ -16,20 +16,36 @@ import { convertToBasisPoints } from '../utils';
 const OneShift14 = 1n << 14n;
 const OneShift15 = 1n << 15n;
 const OneShift16 = 1n << 16n;
+const OneShift17 = 1n << 17n;
 const OneShift248 = 1n << 248n;
 
-// Referrer gets 50% of what ParaSwap takes i.e. 25% of positive slippage
+// Referrer gets 25% of positive slippage
 // Set 16th bit to indicate referral program
-const REFERRER_FEE = 5000n | OneShift14 | OneShift16 | OneShift248;
+const REFERRER_FEE = 2500n | OneShift14 | OneShift16 | OneShift248;
+
+const HALF_SPLIT = '5000';
 
 export function encodeFeePercent(
   partnerFeePercent: string,
   positiveSlippageToUser: boolean,
   side: SwapSide,
 ) {
-  let fee = BigInt(partnerFeePercent);
+  const isNoFeeAndPositiveSlippageToPartner =
+    positiveSlippageToUser === false && BigInt(partnerFeePercent) === 0n;
+
+  let fee = isNoFeeAndPositiveSlippageToPartner
+    ? BigInt(HALF_SPLIT)
+    : BigInt(partnerFeePercent);
+
   if (fee > 10000) throw new Error('fee bps should be less than 10000');
 
+  // Set 16th bit as referrer to split positive slippage for partner and protocol
+  // Set 17th bit to flag on Subgraph that this is a special case
+  if (isNoFeeAndPositiveSlippageToPartner) {
+    fee |= OneShift16;
+    fee |= OneShift17;
+  }
+
   // Set 14th bit if positiveSlippageToUser is true
   if (positiveSlippageToUser) fee |= OneShift14;
 

package/src/types.ts

@@ -289,6 +289,7 @@ export type PreprocessTransactionOptions = {
   txOrigin: Address;
   hmac?: string;
   mockRfqAndLO?: boolean;
+  isDirectMethod?: boolean;
 };
 
 export type TransferFeeParams = {

package/src/utils.ts

@@ -12,7 +12,7 @@ import { AxiosError } from 'axios';
 
 export const isAxiosError = (e: any): e is AxiosError => {
   return e.isAxiosError === true;
-}
+};
 
 export const isETHAddress = (address: string) =>
   address.toLowerCase() === ETHER_ADDRESS.toLowerCase();

package/tests/constants-e2e.ts

@@ -898,7 +898,7 @@ export const Holders: {
   [Network.POLYGON]: {
     MATIC: '0xe7804c37c13166fF0b37F5aE0BB07A3aEbb6e245',
     DAI: '0x06959153B974D0D5fDfd87D561db6d8d4FA0bb0B',
-    WETH: '0x72a53cdbbcc1b9efa39c834a540550e23463aacb',
+    WETH: '0x62ac55b745f9b08f1a81dcbbe630277095cf4be1',
     WMATIC: '0xFffbCD322cEace527C8ec6Da8de2461C6D9d4e6e',
     AMWMATIC: '0x8832924854e3Cedb0a6Abf372e6CCFF9F7654332',
     USDC: '0xf89d7b9c864f589bbf53a82105107622b35eaa40',
@@ -917,8 +917,8 @@ export const Holders: {
     RADIO: '0x60531b9c3645546d864604ee0fc5b7d6adc81cc2',
     HANZO: '0x8a151b6ec99c7b90b342ab401d511b480309b220',
     RVLT: '0x815f87ca3db2b9491115a7769aeacb140361c5a9',
-    stMATIC: '0x3b39669766fe815aa91834b3bd258dea3edbb6d5',
-    axlUSDC: '0x42875ae5766dfd4d70772a3a956842e4b708d59a',
+    stMATIC: '0x6725b8cd3cdbc82a6044689a8bbc64a915d200e7',
+    axlUSDC: '0xe743a49f04f2f77eb2d3b753ae3ad599de8cea84',
     deUSDC: '0x94d5ead1f80cf0b4d3480ab59dff16d47c93e9fe',
     amUSDT: '0x832b11846a27b3ba25d68ae80c39fab155d18c49',
     amUSDC: '0x6e7f19cd23049c7118e14470e2bf85d2e26ee0ae',

package/tests/utils-e2e.ts

@@ -29,12 +29,37 @@ import { constructSimpleSDK, SimpleFetchSDK } from '@paraswap/sdk';
 import axios from 'axios';
 import { SmartToken, StateOverrides } from './smart-tokens';
 import { GIFTER_ADDRESS } from './constants-e2e';
-import { sleep } from './utils';
+import { generateDeployBytecode, sleep } from './utils';
 import { assert } from 'ts-essentials';
 
 export const testingEndpoint = process.env.E2E_TEST_ENDPOINT;
 
-const adapterBytecode = '';
+const testContractProjectRootPath = process.env.TEST_CONTRACT_PROJECT_ROOT_PATH;
+const testContractName = process.env.TEST_CONTRACT_NAME;
+const testContractConfigFileName = process.env.TEST_CONTRACT_CONFIG_FILE_NAME;
+const testContractRelativePath = process.env.TEST_CONTRACT_RELATIVE_PATH;
+// Comma separated fields from config or actual values
+const testContractDeployArgs = process.env.TEST_CONTRACT_DEPLOY_ARGS;
+
+// If you want to test against deployed and verified contract
+const deployedTestContractAddress = process.env.DEPLOYED_TEST_CONTRACT_ADDRESS;
+const testContractType = process.env.TEST_CONTRACT_TYPE;
+
+// Only for router tests
+const testDirectRouterAbiPath = process.env.TEST_DIRECT_ROUTER_ABI_PATH;
+
+const directRouterIface = new Interface(
+  testDirectRouterAbiPath ? require(testDirectRouterAbiPath) : '[]',
+);
+
+const testContractBytecode = generateDeployBytecode(
+  testContractProjectRootPath,
+  testContractName,
+  testContractConfigFileName,
+  testContractRelativePath,
+  testContractDeployArgs,
+  testContractType,
+);
 
 const erc20Interface = new Interface(Erc20ABI);
 const augustusInterface = new Interface(AugustusABI);
@@ -146,7 +171,7 @@ function allowTokenTransferProxyParams(
   };
 }
 
-function deployAdapterParams(bytecode: string, network = Network.MAINNET) {
+function deployContractParams(bytecode: string, network = Network.MAINNET) {
   const ownerAddress = DEPLOYER_ADDRESS[network];
   if (!ownerAddress) throw new Error('No deployer address set for network');
   return {
@@ -156,13 +181,51 @@ function deployAdapterParams(bytecode: string, network = Network.MAINNET) {
   };
 }
 
-function whiteListAdapterParams(contractAddress: Address, network: Network) {
+function augustusSetImplementationParams(
+  contractAddress: Address,
+  network: Network,
+  functionName: string,
+) {
   const augustusAddress = generateConfig(network).augustusAddress;
   if (!augustusAddress) throw new Error('No whitelist address set for network');
   const ownerAddress = MULTISIG[network];
   if (!ownerAddress) throw new Error('No whitelist owner set for network');
-  const role =
-    '0x8429d542926e6695b59ac6fbdcd9b37e8b1aeb757afab06ab60b1bb5878c3b49';
+
+  return {
+    from: ownerAddress,
+    to: augustusAddress,
+    data: augustusInterface.encodeFunctionData('setImplementation', [
+      directRouterIface.getSighash(functionName),
+      contractAddress,
+    ]),
+    value: '0',
+  };
+}
+
+function augustusGrantRoleParams(
+  contractAddress: Address,
+  network: Network,
+  type: string = 'adapter',
+) {
+  const augustusAddress = generateConfig(network).augustusAddress;
+  if (!augustusAddress) throw new Error('No whitelist address set for network');
+  const ownerAddress = MULTISIG[network];
+  if (!ownerAddress) throw new Error('No whitelist owner set for network');
+
+  let role: string;
+  switch (type) {
+    case 'adapter':
+      role =
+        '0x8429d542926e6695b59ac6fbdcd9b37e8b1aeb757afab06ab60b1bb5878c3b49';
+      break;
+    case 'router':
+      role =
+        '0x7a05a596cb0ce7fdea8a1e1ec73be300bdb35097c944ce1897202f7a13122eb2';
+      break;
+    default:
+      throw new Error(`Unrecognized type ${type}`);
+  }
+
   return {
     from: ownerAddress,
     to: augustusAddress,
@@ -174,6 +237,21 @@ function whiteListAdapterParams(contractAddress: Address, network: Network) {
   };
 }
 
+export function formatDeployMessage(
+  type: 'router' | 'adapter',
+  address: Address,
+  forkId: string,
+  contractName: string,
+  contractPath: string,
+) {
+  // This formatting is useful for verification on Tenderly
+  return `Deployed ${type} contract with env params:
+    TENDERLY_FORK_ID=${forkId}
+    TENDERLY_VERIFY_CONTRACT_ADDRESS=${address}
+    TENDERLY_VERIFY_CONTRACT_NAME=${contractName}
+    TENDERLY_VERIFY_CONTRACT_PATH=${contractPath}`;
+}
+
 export async function testE2E(
   srcToken: Token,
   destToken: Token,
@@ -183,7 +261,7 @@ export async function testE2E(
   dexKey: string,
   contractMethod: ContractMethod,
   network: Network = Network.MAINNET,
-  provider: Provider,
+  _0: Provider,
   poolIdentifiers?: string[],
   limitOrderProvider?: DummyLimitOrderProvider,
   transferFees?: TransferFeeParams,
@@ -203,26 +281,63 @@ export async function testE2E(
     expect(allowanceTx!.success).toEqual(true);
   }
 
-  if (adapterBytecode) {
+  if (deployedTestContractAddress) {
+    const whitelistTx = await ts.simulate(
+      augustusGrantRoleParams(
+        deployedTestContractAddress,
+        network,
+        testContractType || 'adapter',
+      ),
+    );
+    expect(whitelistTx.success).toEqual(true);
+
+    if (testContractType === 'router') {
+      const setImplementationTx = await ts.simulate(
+        augustusSetImplementationParams(
+          deployedTestContractAddress,
+          network,
+          contractMethod,
+        ),
+      );
+      expect(setImplementationTx.success).toEqual(true);
+    }
+  } else if (testContractBytecode) {
     const deployTx = await ts.simulate(
-      deployAdapterParams(adapterBytecode, network),
+      deployContractParams(testContractBytecode, network),
     );
 
     expect(deployTx.success).toEqual(true);
-    const adapterAddress =
+
+    const contractAddress =
       deployTx.transaction.transaction_info.contract_address;
     console.log(
-      'Deployed adapter to address',
-      adapterAddress,
-      'used',
-      deployTx.gasUsed,
-      'gas',
+      formatDeployMessage(
+        'adapter',
+        contractAddress,
+        ts.forkId,
+        testContractName || '',
+        testContractRelativePath || '',
+      ),
     );
-
     const whitelistTx = await ts.simulate(
-      whiteListAdapterParams(adapterAddress, network),
+      augustusGrantRoleParams(
+        contractAddress,
+        network,
+        testContractType || 'adapter',
+      ),
     );
     expect(whitelistTx.success).toEqual(true);
+
+    if (testContractType === 'router') {
+      const setImplementationTx = await ts.simulate(
+        augustusSetImplementationParams(
+          contractAddress,
+          network,
+          contractMethod,
+        ),
+      );
+      expect(setImplementationTx.success).toEqual(true);
+    }
   }
 
   const useAPI = testingEndpoint && !poolIdentifiers;
@@ -232,7 +347,7 @@ export async function testE2E(
     : new LocalParaswapSDK(network, dexKey, '', limitOrderProvider);
 
   if (paraswap.initializePricing) await paraswap.initializePricing();
-  
+
   if (sleepMs) {
     await sleep(sleepMs);
   }
@@ -350,13 +465,13 @@ export async function newTestE2E({
     await ts.setup();
   }
 
-  if (useTenderly && adapterBytecode) {
+  if (useTenderly && testContractBytecode) {
     assert(
       ts instanceof TenderlySimulation,
       '`ts`  is not an instance of TenderlySimulation',
     );
     const deployTx = await ts.simulate(
-      deployAdapterParams(adapterBytecode, network),
+      deployContractParams(testContractBytecode, network),
     );
 
     expect(deployTx.success).toEqual(true);
@@ -371,7 +486,7 @@ export async function newTestE2E({
     );
 
     const whitelistTx = await ts.simulate(
-      whiteListAdapterParams(adapterAddress, network),
+      augustusGrantRoleParams(adapterAddress, network),
     );
     expect(whitelistTx.success).toEqual(true);
   }

package/tests/utils.ts

@@ -1,5 +1,8 @@
+/* eslint-disable no-console */
+import { ethers } from 'ethers';
 import { PoolPrices, PoolLiquidity, Address } from '../src/types';
 import { SwapSide } from '../src/constants';
+import { assert } from 'ts-essentials';
 
 // Assuming that the amounts are increasing at same interval, and start with 0
 export function checkPoolPrices(
@@ -73,3 +76,52 @@ export const sleep = (time: number) =>
   new Promise(resolve => {
     setTimeout(resolve, time);
   });
+
+export const generateDeployBytecode = (
+  testContractProjectRootPath: string | undefined,
+  testContractName: string | undefined,
+  testContractConfigFileName: string | undefined,
+  testContractRelativePath: string | undefined,
+  testContractDeployArgs: string | undefined,
+  testContractType: string | undefined,
+): string => {
+  if (
+    !testContractProjectRootPath ||
+    !testContractName ||
+    !testContractConfigFileName ||
+    !testContractRelativePath ||
+    !testContractDeployArgs ||
+    !testContractType
+  ) {
+    return '';
+  }
+
+  const artifactJsonPath = `${testContractProjectRootPath}/artifacts/${testContractName}.json`;
+  const configJsonPath = `${testContractProjectRootPath}/config/${testContractConfigFileName}.json`;
+  const fieldsToPickFromConfig = testContractDeployArgs.split(',');
+
+  const artifact = require(artifactJsonPath) as {
+    abi: ethers.ContractInterface;
+    bytecode: string;
+  };
+  // I don't want to type this testing thing. If something is wrong, I will just throw
+  const config = require(configJsonPath) as any;
+  const factory = new ethers.ContractFactory(artifact.abi, artifact.bytecode);
+
+  const args = fieldsToPickFromConfig.map(f => {
+    const value = config[f];
+    if (value === undefined) {
+      console.log(
+        `Field ${f} is not defined in configJsonPath=${configJsonPath}. Using value as it is`,
+      );
+      return f;
+    }
+    return value;
+  });
+
+  const deployedBytecode = factory.getDeployTransaction(...args).data;
+
+  assert(deployedBytecode !== undefined, 'deployedBytecode is undefined');
+
+  return deployedBytecode.toString();
+};

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/build/dex/pancakeswap-v3/types.d.ts

@@ -1,14 +0,0 @@
-import { Address } from '../../types';
-export declare type DexParams = {
-    router: Address;
-    quoter: Address;
-    factory: Address;
-    stateMulticall: Address;
-    uniswapMulticall: Address;
-    supportedFees: bigint[];
-    feeProtocols: bigint[];
-    chunksCount: number;
-    deployer?: Address;
-    subgraphURL: string;
-    initHash: string;
-};

package/build/dex/solidly/forks-override/chronos.d.ts

@@ -1,20 +0,0 @@
-import { Solidly } from '../solidly';
-import { SolidlyPair } from '../types';
-import { Network } from '../../../constants';
-import { IDexHelper } from '../../../dex-helper';
-export declare class Chronos extends Solidly {
-    protected network: Network;
-    protected dexHelper: IDexHelper;
-    static dexKeysWithNetwork: {
-        key: string;
-        networks: Network[];
-    }[];
-    constructor(network: Network, dexKey: string, dexHelper: IDexHelper);
-    protected getFeesMultiCallData(pair: SolidlyPair): {
-        callEntry: {
-            target: string;
-            callData: string;
-        };
-        callDecoder: (values: any[]) => number;
-    };
-}

package/build/dex/solidly/forks-override/chronos.js

@@ -1,44 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Chronos = void 0;
-const solidly_1 = require("../solidly");
-const abi_1 = require("@ethersproject/abi");
-const utils_1 = require("../../../utils");
-const config_1 = require("../config");
-const lodash_1 = __importDefault(require("lodash"));
-const ChronosFactoryABI = [
-    {
-        inputs: [{ internalType: 'bool', name: '_stable', type: 'bool' }],
-        name: 'getFee',
-        outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-];
-const chronosFactoryIface = new abi_1.Interface(ChronosFactoryABI);
-class Chronos extends solidly_1.Solidly {
-    constructor(network, dexKey, dexHelper) {
-        super(network, dexKey, dexHelper, true);
-        this.network = network;
-        this.dexHelper = dexHelper;
-    }
-    getFeesMultiCallData(pair) {
-        const callEntry = {
-            target: this.factoryAddress,
-            callData: chronosFactoryIface.encodeFunctionData('getFee', [pair.stable]),
-        };
-        const callDecoder = (values) => parseInt(chronosFactoryIface
-            .decodeFunctionResult('getFee', values)[0]
-            .toString());
-        return {
-            callEntry,
-            callDecoder,
-        };
-    }
-}
-exports.Chronos = Chronos;
-Chronos.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(lodash_1.default.pick(config_1.SolidlyConfig, ['Chronos']));
-//# sourceMappingURL=chronos.js.map

package/build/dex/solidly/forks-override/chronos.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chronos.js","sourceRoot":"","sources":["../../../../src/dex/solidly/forks-override/chronos.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAqC;AAIrC,4CAA+C;AAC/C,0CAAuD;AACvD,sCAA0C;AAC1C,oDAAuB;AAEvB,MAAM,iBAAiB,GAAG;IACxB;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACjE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,eAAS,CAAC,iBAAiB,CAAC,CAAC;AAE7D,MAAa,OAAQ,SAAQ,iBAAO;IAIlC,YACY,OAAgB,EAC1B,MAAc,EACJ,SAAqB;QAE/B,KAAK,CACH,OAAO,EACP,MAAM,EACN,SAAS,EACT,IAAI,CACL,CAAC;QATQ,YAAO,GAAP,OAAO,CAAS;QAEhB,cAAS,GAAT,SAAS,CAAY;IAQjC,CAAC;IAES,oBAAoB,CAAC,IAAiB;QAC9C,MAAM,SAAS,GAAG;YAChB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,mBAAmB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1E,CAAC;QACF,MAAM,WAAW,GAAG,CAAC,MAAa,EAAE,EAAE,CACpC,QAAQ,CACN,mBAAmB;aAChB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;aACzC,QAAQ,EAAE,CACd,CAAC;QAEJ,OAAO;YACL,SAAS;YACT,WAAW;SACZ,CAAC;IACJ,CAAC;;AAjCH,0BAkCC;AAjCe,0BAAkB,GAC9B,IAAA,6BAAqB,EAAC,gBAAC,CAAC,IAAI,CAAC,sBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC"}