solana-mint-recovery-engine 1.0.0 → 1.1.1

package/README.md

@@ -0,0 +1,297 @@
+# Solana Mint & Token Account Recovery Engine (SMRE)
+
+SMRE is an enterprise-grade Command Line Interface (CLI) tool and programmatic library designed to safely scan, inspect, build, sign, simulate, and submit transactions to recover excess SOL (lamports) lying above the rent-exempt minimum in Solana **Token-2022 (Token Extensions)** accounts, mints, and multisigs.
+
+---
+
+## Table of Contents
+1. [Core Features](#core-features)
+2. [Architectural Highlights](#architectural-highlights)
+3. [Installation & Setup](#installation--setup)
+4. [CLI Command Reference](#cli-command-reference)
+   - [1. Diagnostics: `doctor`](#1-diagnostics-doctor)
+   - [2. Config Initialization: `config init`](#2-config-initialization-config-init)
+   - [3. Batch Scanning: `scan`](#3-batch-scanning-scan)
+   - [4. Single Inspection: `inspect`](#4-single-inspection-inspect)
+   - [5. Building Transaction Envelopes: `build`](#5-building-transaction-envelopes-build)
+   - [6. Simulation: `simulate`](#6-simulation-simulate)
+   - [7. Offline Signing: `sign`](#7-offline-signing-sign)
+   - [8. Submission: `submit`](#8-submission-submit)
+   - [9. Inline Recovery: `recover`](#9-inline-recovery-recover)
+5. [Configuration Schema](#configuration-schema)
+6. [Offline Transaction Envelope Schema](#offline-transaction-envelope-schema)
+7. [Programmatic Library Usage](#programmatic-library-usage)
+8. [NPM Publishing Guide (Developer Release Flow)](#npm-publishing-guide-developer-release-flow)
+
+---
+
+## Core Features
+- **Zero-Loss Float Arithmetic:** Operates entirely with native TypeScript `BigInt` types to prevent floating-point inaccuracies for multi-million SOL recoveries.
+- **Multisig Support:** Handles Token-2022 multisig accounts, tracking thresholds and collecting multi-signatures offline.
+- **Offline / Air-Gapped Signature Collection:** Supports separation of duties. Build transactions online, sign offline, and broadcast from a secure node.
+- **On-Chain Simulations:** Employs stable, public `@solana/web3.js` simulation APIs to run pre-execution checks and print execution logs.
+- **Network Resilience:** Automatically injects Compute Budget and Priority Fee instructions to land transactions during times of high congestion.
+- **Secure Key Handling:** Automatically scrubs private key arrays from memory immediately after keypair instantiation.
+
+---
+
+## Architectural Highlights
+
+### Precision-Safe Fee Routing (HIGH-08 Fix)
+In standard implementations, splitting fees requires both the destination address and the authority to sign the transaction. SMRE avoids this requirement:
+1. Withdraws excess lamports from the Token-2022 account to the **Authority** address.
+2. Transfers the platform fee from the **Authority** to the **Fee Wallet**.
+3. Forwards the net amount from the **Authority** to the final **Destination**.
+
+Since the **Authority** is already a required signer on the `WithdrawExcessLamports` instruction, no additional signature is required from the destination wallet.
+
+---
+
+## Installation & Setup
+
+### Requirements
+- **Node.js:** >= 18.0.0
+- **NPM:** (Included with Node.js)
+
+### 1. Global Installation (Recommended)
+To install the CLI globally on your system and run it from any directory:
+```bash
+npm install -g solana-mint-recovery-engine
+```
+Once installed, verify the installation by checking the version or running the diagnostics:
+```bash
+smre --version
+smre doctor
+```
+
+### 2. Run Instantly with NPX (No Installation Required)
+If you prefer not to install the package permanently, you can execute commands on-demand directly from the npm registry using `npx`:
+```bash
+npx solana-mint-recovery-engine doctor
+npx solana-mint-recovery-engine scan addresses.txt
+```
+
+### 3. Local Development & Contribution
+If you want to build and run the project locally from source:
+1. Clone the repository and install dependencies:
+   ```bash
+   npm install
+   ```
+2. Build the TypeScript files:
+   ```bash
+   npm run build
+   ```
+3. Link the package to your global bin path for local testing:
+   ```bash
+   npm link
+   ```
+   You can now run `smre` globally, and it will execute your local build.
+
+---
+
+## CLI Command Reference
+
+### 1. Diagnostics: `doctor`
+Performs comprehensive checks on the system environment, Node.js version, configuration file health, RPC connection latency, and rent exemption estimates.
+```bash
+smre doctor [--config <path>]
+```
+
+### 2. Config Initialization: `config init`
+Creates a default `smre.config.json` configuration file in the working directory.
+```bash
+smre config init [-o <output-path>]
+```
+
+### 3. Batch Scanning: `scan`
+Scans a text file containing base58-encoded Solana addresses for recoverable excess lamports. Uses high-performance batching (100 accounts per batch) and reports results in a clean table or structured JSON.
+```bash
+smre scan <address-file> [--json] [--config <path>]
+```
+*Note: The address file should contain one address per line. Lines starting with `#` or `//` are treated as comments.*
+
+### 4. Single Inspection: `inspect`
+Analyzes a single Token-2022 account, mint, or multisig on-chain, rendering details about owner program, balance, rent floor, authority, and recovery status.
+```bash
+smre inspect <address> [--json] [--config <path>]
+```
+
+### 5. Building Transaction Envelopes: `build`
+Constructs an unsigned transaction to recover excess lamports and saves it into an offline Transaction Envelope JSON file.
+```bash
+smre build <source-address> \
+  -d <destination-address> \
+  -o <output-envelope.json> \
+  [--fee-wallet <address>] \
+  [--fee-percent <number>] \
+  [--fee-payer <address>]
+```
+
+### 6. Simulation: `simulate`
+Runs an on-chain simulation of the constructed Transaction Envelope to verify instructions, print execution logs, and measure compute unit consumption without broadcasting.
+```bash
+smre simulate <envelope-file>
+```
+
+### 7. Offline Signing: `sign`
+Signs an offline Transaction Envelope. Supports JSON keypair files, raw base58 private key strings, or direct JSON private key arrays. Automatically tracks signature slots.
+```bash
+smre sign <envelope-file> \
+  -k <keypair-secret-or-path> \
+  [-o <output-envelope.json>]
+```
+
+### 8. Submission: `submit`
+Validates that the required signature threshold is met (including multisig threshold), broadcasts the transaction to the network, and polls the node for confirmation.
+```bash
+smre submit <envelope-file>
+```
+
+### 9. Inline Recovery: `recover`
+Convenience command that performs inspection, building, signing, simulation, submission, and confirmation in a single online step.
+```bash
+smre recover <source-address> \
+  -k <keypair-secret-or-path> \
+  -d <destination-address> \
+  [--fee-wallet <address>] \
+  [--fee-percent <number>]
+```
+
+---
+
+## Configuration Schema
+Configuration options can be placed in `smre.config.json` or passed as a custom file using the `-c` flag.
+```json
+{
+  "rpcUrl": "https://api.mainnet-beta.solana.com",
+  "commitment": "confirmed",
+  "defaultDestination": "9xQdBNbLqP55ePE1R24g5652uhGzTsw34JmUCwm",
+  "feeWallet": "EGMQSHdW5vLvTZ4ro8BkGjWerXcWH7oHVW2EDMJqPA4x",
+  "feePercentage": 2.5,
+  "priorityFee": 5000
+}
+```
+
+---
+
+## Offline Transaction Envelope Schema
+Transaction envelopes use a strict, schema-validated JSON format:
+```json
+{
+  "version": "1.1.0",
+  "type": "withdraw-excess-lamports",
+  "metadata": {
+    "sourceAddress": "4zMMC9ZdZhLx2u223612q76Cc223612q76Cc223612",
+    "sourceType": "mint",
+    "destinationAddress": "9xQdBNbLqP55ePE1R24g5652uhGzTsw34JmUCwm",
+    "authorityAddress": "F223612q76Cc223612q76Cc223612q76Cc223612q",
+    "excessLamports": "2960720",
+    "rentFloor": "1461600",
+    "createdAt": "2026-07-07T13:25:28Z",
+    "blockhash": "D9yVwZ9p8N...WdQsK",
+    "lastValidBlockHeight": 268495034,
+    "feePercentage": 2.5,
+    "feeWallet": "EGMQSHdW5vLvTZ4ro8BkGjWerXcWH7oHVW2EDMJqPA4x",
+    "isToken2022": true
+  },
+  "rawTransactionB64": "AYADg...",
+  "signatures": [
+    {
+      "pubkey": "F223612q76Cc223612q76Cc223612q76Cc223612q",
+      "signature": "3uXp9G..."
+    }
+  ]
+}
+```
+
+---
+
+## Programmatic Library Usage
+SMRE is fully typed and can be imported directly into node-based scripts:
+```typescript
+import { RpcAdapter, buildRecoveryInstructions, lamportsToSolString } from 'solana-mint-recovery-engine';
+import { PublicKey, Transaction } from '@solana/web3.js';
+
+async function main() {
+  const rpc = new RpcAdapter('https://api.mainnet-beta.solana.com', 'confirmed');
+  
+  // Inspect
+  const target = new PublicKey('...');
+  const account = await rpc.inspectAccount(target);
+  
+  const rentFloor = await rpc.getMinimumBalanceForRentExemption(account.dataSize);
+  const excess = account.balance - rentFloor;
+  
+  console.log(`Recoverable amount: ${lamportsToSolString(excess)} SOL`);
+
+  if (excess > 0n && account.authority) {
+    const instructions = buildRecoveryInstructions({
+      source: target,
+      destination: new PublicKey('...'),
+      authority: account.authority,
+      excessAmount: excess,
+      priorityFee: 1000,
+    });
+
+    const tx = new Transaction().add(...instructions);
+    // Continue with sign/submit...
+  }
+}
+```
+
+---
+
+## NPM Publishing Guide (Developer Release Flow)
+
+Follow these steps to publish or update the package on the NPM registry:
+
+### 1. Prerequisite Checks
+Before publishing, ensure the codebase is completely clean, builds successfully, and passes all tests.
+```bash
+# Verify TypeScript compiles without errors
+npm run lint
+
+# Run Jest tests and verification tests
+npm run test
+npm run test:run
+```
+
+### 2. Configure package.json Metadata
+Ensure the following fields are correct in `package.json`:
+- `"name"`: Set to your package name (e.g., `solana-mint-recovery-engine` or a scoped package name like `@my-org/smre`).
+- `"publishConfig"`: If using a scoped package, you may want to set it to public:
+  ```json
+  "publishConfig": {
+    "access": "public"
+  }
+  ```
+
+### 3. Versioning
+Increment the package version according to Semantic Versioning (SemVer):
+- **Patch release** (bug fixes): `npm version patch` (e.g., `1.1.0` → `1.1.1`)
+- **Minor release** (new backward-compatible features): `npm version minor` (e.g., `1.1.0` → `1.2.0`)
+- **Major release** (breaking changes): `npm version major` (e.g., `1.1.0` → `2.0.0`)
+
+This command updates `package.json`, `package-lock.json`, and creates a local Git tag.
+
+### 4. Authenticate with NPM
+If you are not logged in, run:
+```bash
+npm login
+```
+Provide your username, password, email, and one-time password (OTP).
+
+### 5. Publish to the Registry
+Publish the package. The `"prepack"` script in `package.json` will automatically trigger `npm run build` to compile the TypeScript code to `./dist` before packaging:
+```bash
+npm publish
+```
+If you are publishing a scoped package for the first time:
+```bash
+npm publish --access public
+```
+
+---
+
+## License
+MIT

package/dist/bin/smre.js

@@ -11,11 +11,30 @@ const submit_1 = require("../src/commands/submit");
 const recover_1 = require("../src/commands/recover");
 const config_1 = require("../src/commands/config");
 const doctor_1 = require("../src/commands/doctor");
+// Determine package.json path dynamically based on runtime location
+let packageJson;
+try {
+    // Production path (dist/bin/smre.js -> ../../package.json)
+    packageJson = require('../../package.json');
+}
+catch {
+    // Development path (bin/smre.ts -> ../package.json)
+    packageJson = require('../package.json');
+}
+// MED-12: Global error handler for unhandled exceptions/rejections
+process.on('unhandledRejection', (reason) => {
+    console.error(`\n✘ Unhandled error: ${reason}`);
+    process.exit(1);
+});
+process.on('uncaughtException', (err) => {
+    console.error(`\n✘ Fatal error: ${err.message}`);
+    process.exit(1);
+});
 const program = new commander_1.Command();
 program
     .name('smre')
     .description('Solana Mint & Token Account Recovery Engine (SMRE) CLI')
-    .version('1.0.0')
+    .version(packageJson.version)
     .option('-c, --config <path>', 'Path to custom configuration JSON file');
 program
     .command('scan <address-file>')
@@ -104,3 +123,4 @@ program
     (0, doctor_1.runDoctor)(program.opts().config);
 });
 program.parse(process.argv);
+//# sourceMappingURL=smre.js.map

package/dist/bin/smre.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"smre.js","sourceRoot":"","sources":["../../bin/smre.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/build.js

@@ -9,40 +9,82 @@ const rpc_1 = require("../io/rpc");
 const rent_1 = require("../core/rent");
 const transaction_1 = require("../core/transaction");
 const file_1 = require("../io/file");
+const constants_1 = require("../core/constants");
+const format_1 = require("../core/format");
+const logger_1 = require("../io/logger");
 const chalk_1 = __importDefault(require("chalk"));
 async function runBuild(addressStr, options) {
     try {
         const config = (0, file_1.loadConfig)(options.config);
         const rpc = new rpc_1.RpcAdapter(config.rpcUrl, config.commitment);
-        const source = new web3_js_1.PublicKey(addressStr);
+        // MED-07: Validate public key input
+        let source;
+        try {
+            source = new web3_js_1.PublicKey(addressStr);
+        }
+        catch {
+            throw new Error(`Invalid source address: "${addressStr}". Expected a valid base58-encoded public key.`);
+        }
         // 1. Inspect account state
+        logger_1.logger.step(1, 8, 'Inspecting target account...');
         const account = await rpc.inspectAccount(source);
+        // CRIT-03: Reject legacy token accounts
         if (!account.isToken2022) {
-            throw new Error(`Account is not owned by the Token-2022 program. Recoveries are not supported.`);
+            throw new Error(`Account ${source.toBase58()} is owned by the legacy SPL Token Program. ` +
+                `The WithdrawExcessLamports instruction is a Token-2022-only feature. ` +
+                `Recovery from legacy token accounts requires a different mechanism.`);
+        }
+        // HIGH-04: Use RPC-based rent floor
+        let rentFloor;
+        let excess;
+        try {
+            rentFloor = await rpc.getMinimumBalanceForRentExemption(account.dataSize);
+            excess = account.balance > rentFloor ? account.balance - rentFloor : 0n;
+        }
+        catch {
+            const offlineResult = (0, rent_1.calculateExcessLamports)(account.dataSize, account.balance);
+            rentFloor = offlineResult.rentFloor;
+            excess = offlineResult.excess;
         }
-        const { excess, rentFloor } = (0, rent_1.calculateExcessLamports)(account.dataSize, account.balance);
         if (excess <= 0n) {
             throw new Error(`Account has no excess lamports above the rent floor (${rentFloor.toLocaleString()} lamports).`);
         }
         // 2. Resolve destination
+        logger_1.logger.step(2, 8, 'Resolving destination...');
         const destinationStr = options.destination || config.defaultDestination;
         if (!destinationStr) {
             throw new Error(`No destination address specified. Use --destination <address> or define defaultDestination in config.`);
         }
-        const destination = new web3_js_1.PublicKey(destinationStr);
+        let destination;
+        try {
+            destination = new web3_js_1.PublicKey(destinationStr);
+        }
+        catch {
+            throw new Error(`Invalid destination address: "${destinationStr}". Expected a valid base58-encoded public key.`);
+        }
         // 3. Resolve authority
-        const authority = account.authority;
+        logger_1.logger.step(3, 8, 'Resolving authority...');
+        let authority = account.authority;
         if (!authority) {
-            throw new Error(`No authority found for account. It is not recoverable.`);
+            if (account.type === 'mint') {
+                authority = source;
+                // CRIT-05: Clear messaging about what this means
+                logger_1.logger.warn(`Mint authority is revoked. Recovery will require the ORIGINAL MINT KEYPAIR ` +
+                    `(the private key that created mint address ${source.toBase58()}). ` +
+                    `If you do not possess this keypair, the transaction will fail to sign.`);
+            }
+            else {
+                throw new Error(`No authority found for account ${source.toBase58()}. Recovery is not possible.`);
+            }
         }
         // 4. Resolve fee payer
+        logger_1.logger.step(4, 8, 'Resolving fee payer...');
         let feePayer = authority;
         if (account.type === 'multisig' && account.multisigSigners && account.multisigSigners.length > 0) {
             if (options.feePayer) {
                 feePayer = new web3_js_1.PublicKey(options.feePayer);
             }
             else {
-                // Default to the first co-signer for multisig accounts
                 feePayer = account.multisigSigners[0];
             }
         }
@@ -50,14 +92,26 @@ async function runBuild(addressStr, options) {
             feePayer = new web3_js_1.PublicKey(options.feePayer);
         }
         // 5. Resolve platform fee wallet & percentage
+        logger_1.logger.step(5, 8, 'Resolving fee configuration...');
         const feeWalletStr = options.feeWallet || config.feeWallet;
-        const feePercentage = options.feePercent !== undefined
-            ? parseInt(options.feePercent, 10)
-            : config.feePercentage;
+        // CRIT-06 FIX: Proper fee percentage parsing with validation
+        let feePercentage = config.feePercentage;
+        if (options.feePercent !== undefined) {
+            const parsed = parseFloat(options.feePercent);
+            if (isNaN(parsed) || parsed < 0 || parsed > 100) {
+                throw new Error(`Invalid fee percentage: "${options.feePercent}". Must be a number between 0 and 100.`);
+            }
+            feePercentage = parsed;
+        }
         const feeWallet = feeWalletStr ? new web3_js_1.PublicKey(feeWalletStr) : undefined;
-        // 6. Fetch latest blockhash
-        const blockhash = await rpc.getLatestBlockhash();
+        if (feeWallet && feePercentage > 0) {
+            logger_1.logger.info(`Platform fee: ${feePercentage}% to ${feeWallet.toBase58()}`);
+        }
+        // 6. Fetch latest blockhash (HIGH-02: include lastValidBlockHeight)
+        logger_1.logger.step(6, 8, 'Fetching latest blockhash...');
+        const { blockhash, lastValidBlockHeight } = await rpc.getLatestBlockhash();
         // 7. Build instructions
+        logger_1.logger.step(7, 8, 'Building transaction instructions...');
         const instructions = (0, transaction_1.buildRecoveryInstructions)({
             source,
             destination,
@@ -66,8 +120,11 @@ async function runBuild(addressStr, options) {
             developerFeeWallet: feeWallet,
             feePercentage,
             multiSigners: account.multisigSigners,
+            programId: account.ownerProgram,
+            priorityFee: config.priorityFee,
         });
         // 8. Compile transaction
+        logger_1.logger.step(8, 8, 'Compiling transaction...');
         const tx = new web3_js_1.Transaction();
         tx.add(...instructions);
         tx.recentBlockhash = blockhash;
@@ -78,9 +135,9 @@ async function runBuild(addressStr, options) {
             verifySignatures: false,
         });
         const rawTransactionB64 = serialized.toString('base64');
-        // 9. Create envelope JSON
+        // Create envelope JSON
         const envelope = {
-            version: '1.0.0',
+            version: constants_1.ENVELOPE_VERSION,
             type: 'withdraw-excess-lamports',
             metadata: {
                 sourceAddress: source.toBase58(),
@@ -91,6 +148,10 @@ async function runBuild(addressStr, options) {
                 rentFloor: rentFloor.toString(),
                 createdAt: new Date().toISOString(),
                 blockhash,
+                lastValidBlockHeight,
+                isToken2022: account.isToken2022,
+                feePercentage: feeWallet ? feePercentage : undefined,
+                feeWallet: feeWallet?.toBase58(),
             },
             rawTransactionB64,
             signatures: [],
@@ -120,20 +181,25 @@ async function runBuild(addressStr, options) {
         }
         // Write envelope file
         (0, file_1.writeEnvelope)(options.output, envelope);
-        console.log(chalk_1.default.green(`✔ Built transaction envelope and saved to ${options.output}`));
-        console.log('\nTransaction Metadata:');
+        logger_1.logger.success(`Built transaction envelope → ${options.output}`);
+        console.log('\nTransaction Details:');
         console.log(`  Source:      ${envelope.metadata.sourceAddress} (${envelope.metadata.sourceType})`);
         console.log(`  Destination: ${envelope.metadata.destinationAddress}`);
         console.log(`  Authority:   ${envelope.metadata.authorityAddress}`);
         console.log(`  Fee Payer:   ${feePayer.toBase58()}`);
-        console.log(`  Recoverable: ${Number(excess) / 1e9} SOL`);
-        if (feeWallet) {
-            console.log(`  Fee Split:   ${feePercentage}% to ${feeWallet.toBase58()}`);
+        console.log(`  Recoverable: ${(0, format_1.formatSol)(excess)}`);
+        if (feeWallet && feePercentage > 0) {
+            const feeAmount = (excess * BigInt(Math.round(feePercentage * 100))) / 10000n;
+            const netAmount = excess - feeAmount;
+            console.log(`  Fee Split:   ${feePercentage}% → ${feeWallet.toBase58()} (${(0, format_1.formatSol)(feeAmount)})`);
+            console.log(`  Net Amount:  ${(0, format_1.formatSol)(netAmount)}`);
         }
         console.log(`  Blockhash:   ${envelope.metadata.blockhash}`);
+        console.log(chalk_1.default.yellow(`  ⚠ Blockhash expires in ~60-90 seconds. Sign and submit promptly.`));
     }
     catch (err) {
-        console.error(chalk_1.default.red(`✘ Failed to build transaction: ${err.message}`));
+        logger_1.logger.fail(`Failed to build transaction: ${err.message}`);
         process.exit(1);
     }
 }
+//# sourceMappingURL=build.js.map

package/dist/src/commands/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/config.js

@@ -6,16 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initConfig = initConfig;
 const file_1 = require("../io/file");
 const validation_1 = require("../core/validation");
+const logger_1 = require("../io/logger");
 const chalk_1 = __importDefault(require("chalk"));
 function initConfig(outputPath = 'smre.config.json') {
     try {
         const defaultConfig = validation_1.ConfigSchema.parse({});
         (0, file_1.writeConfig)(outputPath, defaultConfig);
-        console.log(chalk_1.default.green(`✔ Initialized default configuration at ${outputPath}`));
+        logger_1.logger.success(`Initialized default configuration at ${outputPath}`);
         console.log(JSON.stringify(defaultConfig, null, 2));
+        console.log(chalk_1.default.yellow(`\n  ⚠ Review and customize this file before use.\n` +
+            `  In particular, set your defaultDestination and review fee settings.`));
     }
     catch (err) {
-        console.error(chalk_1.default.red(`✘ Failed to initialize configuration: ${err.message}`));
+        logger_1.logger.fail(`Failed to initialize configuration: ${err.message}`);
         process.exit(1);
     }
 }
+//# sourceMappingURL=config.js.map

package/dist/src/commands/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/config.ts"],"names":[],"mappings":";;;;;AAKA,gCAcC;AAnBD,qCAAyC;AACzC,mDAAkD;AAClD,yCAAsC;AACtC,kDAA0B;AAE1B,SAAgB,UAAU,CAAC,aAAqB,kBAAkB;IAChE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,yBAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAA,kBAAW,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QACvC,eAAM,CAAC,OAAO,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CACtB,oDAAoD;YACpD,uEAAuE,CACxE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,IAAI,CAAC,uCAAwC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}