@exponent-labs/exponent-sdk 0.1.8 → 0.9.0

package/build/exponentVaults/vaultTransactionBuilder.js

@@ -0,0 +1,470 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundleForJito = exports.VaultTransactionBuilder = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const loopscale_client_1 = require("./loopscale-client");
+const vault_interaction_1 = require("./vault-interaction");
+const syncTransaction_1 = require("./syncTransaction");
+// ============================================================================
+// Jito constants
+// ============================================================================
+const JITO_TIP_ADDRESSES = [
+    new web3_js_1.PublicKey("96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5"),
+    new web3_js_1.PublicKey("HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe"),
+    new web3_js_1.PublicKey("Cw8CFyM9FkoMi7K7Crf6HNQqf4uEMzpKw6QNghXLvLkY"),
+    new web3_js_1.PublicKey("ADaUMid9yfUytqMBgopwjb2DTLSokTSzL1zt6iGPaS49"),
+    new web3_js_1.PublicKey("DfXygSm4jCyNCybVYYK6DwvWqjKee8pbDmJGcLWNDXjh"),
+    new web3_js_1.PublicKey("ADuUkR4vqLUMWXxW9gh6D6L8pMSawimctcNZ5pGwDcEt"),
+    new web3_js_1.PublicKey("DttWaMuVvTiduZRnguLF7jNxTgiMBZ1hyAumKUiL2KRL"),
+    new web3_js_1.PublicKey("3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT"),
+];
+const JITO_REGIONAL_URLS = [
+    "https://amsterdam.mainnet.block-engine.jito.wtf",
+    "https://frankfurt.mainnet.block-engine.jito.wtf",
+    "https://ny.mainnet.block-engine.jito.wtf",
+    "https://tokyo.mainnet.block-engine.jito.wtf",
+];
+const JITO_MAINNET_URL = "https://mainnet.block-engine.jito.wtf";
+const JITO_BUNDLES_PATH = "/api/v1/bundles";
+const JITO_MAX_RETRIES = 10;
+const JITO_RETRY_DELAY_MS = 1000;
+// ============================================================================
+// VaultTransactionBuilder
+// ============================================================================
+/**
+ * Orchestrates strategy vault transaction construction.
+ *
+ * Replaces the per-recipe boilerplate of manually assembling compute budgets,
+ * price refresh instructions, sync transaction wrapping, ALT gathering, and
+ * setup transaction splitting.
+ *
+ * **Lifecycle:** create → add actions → build → sendJitoBundle
+ *
+ * @example Single action
+ * ```ts
+ * const result = await VaultTransactionBuilder
+ *   .create({ vault, connection, signer: manager.publicKey, vaultPda, pricesAccount })
+ *   .addActions([clmmAction.buyPt({ market, ptOutMin, syInMax })])
+ *   .build()
+ *
+ * await result.sendJitoBundle({ signers: [manager], tipLamports: 10_000 })
+ * ```
+ *
+ * @example Multi-step — each addActions() becomes its own sync transaction
+ * ```ts
+ * const result = await VaultTransactionBuilder
+ *   .create({ vault, connection, signer: manager.publicKey, vaultPda, pricesAccount })
+ *   .addActions([kaminoAction.deposit("MAIN", "USDC", amount)])   // sync tx 1
+ *   .addActions([kaminoAction.borrow("MAIN", "SOL", amount)])     // sync tx 2
+ *   .build()
+ *
+ * await result.sendJitoBundle({ signers: [manager], tipLamports: 10_000 })
+ * ```
+ *
+ * @example Mixed Kamino + Loopscale — co-signing handled automatically
+ * ```ts
+ * const result = await VaultTransactionBuilder
+ *   .create({ vault, connection, signer: manager.publicKey, vaultPda, pricesAccount })
+ *   .addActions([kaminoAction.deposit(...)])                        // signed normally
+ *   .addLoopscaleActions([loopscaleAction.createStrategy({ ... })]) // co-signed automatically
+ *   .build()
+ *
+ * // sendJitoBundle auto-creates a LoopscaleClient and co-signs Loopscale steps
+ * await result.sendJitoBundle({ signers: [manager], tipLamports: 10_000 })
+ * ```
+ */
+class VaultTransactionBuilder {
+    config;
+    steps = [];
+    stepCounter = 0;
+    constructor(config) {
+        this.config = config;
+    }
+    /**
+     * Create a new builder instance.
+     *
+     * @param config - Builder configuration including the vault, connection, signer, and prices.
+     * @returns A new {@link VaultTransactionBuilder} ready for action chaining.
+     */
+    static create(config) {
+        return new VaultTransactionBuilder(config);
+    }
+    /**
+     * Add vault instructions as a new step.
+     *
+     * Each call creates a **separate Squads sync transaction** with its own policy matching.
+     * This prevents oversized transactions — Solana transactions are limited to 1232 bytes,
+     * and most vault actions (Kamino deposit, CLMM trade, etc.) use many accounts.
+     *
+     * To chain multiple calls, each gets its own sync transaction:
+     * ```ts
+     * builder
+     *   .addActions([kaminoAction.deposit(...)])   // sync tx 1
+     *   .addActions([kaminoAction.borrow(...)])    // sync tx 2
+     * ```
+     *
+     * **Warning:** Passing multiple actions in a single array packs them into one sync
+     * transaction. This can easily exceed the 1232-byte Solana packet limit — the builder
+     * will throw an error at build time if the resulting transaction is oversized.
+     * Only combine actions in one array when you know they fit (e.g., two small instructions).
+     *
+     * @param instructions - Array of VaultInstruction descriptors (from kaminoAction, clmmAction, etc.).
+     * @param options - Optional per-step compute budget overrides and label.
+     * @returns `this` for chaining.
+     */
+    addActions(instructions, options) {
+        this.stepCounter++;
+        const label = options?.label ?? `step-${this.stepCounter}`;
+        this.steps.push({ label, instructions: [...instructions], isLoopscale: false, options: options ?? {} });
+        return this;
+    }
+    /**
+     * Add Loopscale vault instructions as a new step.
+     *
+     * Each call creates a separate Squads sync transaction, marked for Loopscale co-signing.
+     * At send time, these steps are automatically co-signed via an internally created
+     * LoopscaleClient — no separate configuration needed.
+     *
+     * **Warning:** Passing multiple Loopscale actions in a single array packs them into one
+     * sync transaction. This can exceed the 1232-byte limit — the builder will throw at
+     * build time if oversized. Loopscale transactions are particularly account-heavy;
+     * prefer one action per call.
+     *
+     * @param instructions - Array of Loopscale VaultInstruction descriptors (from loopscaleAction).
+     * @param options - Optional per-step compute budget overrides and label.
+     * @returns `this` for chaining.
+     */
+    addLoopscaleActions(instructions, options) {
+        this.stepCounter++;
+        const label = options?.label ?? `loopscale-step-${this.stepCounter}`;
+        this.steps.push({ label, instructions: [...instructions], isLoopscale: true, options: options ?? {} });
+        return this;
+    }
+    /**
+     * Build TransactionSets from the configured steps.
+     *
+     * Produces an ordered array of TransactionSets:
+     * 1. **Price refresh** (index 0) — oracle price update instructions
+     * 2. **Setup transactions** — token account creation (only if needed)
+     * 3. **Sync transactions** — one per step, wrapped in Squads sync transaction
+     *
+     * The price refresh must land in the same slot as the sync transactions.
+     * Use `result.sendJitoBundle()` for atomic same-slot execution.
+     *
+     * @returns A {@link VaultTransactionBuildResult} with TransactionSets and a sendJitoBundle method.
+     * @throws If no steps have been configured (call addActions first).
+     * @throws If any assembled transaction exceeds the 1232-byte Solana packet limit.
+     */
+    async build() {
+        if (this.steps.length === 0) {
+            throw new Error("No steps configured. Call addActions() or addLoopscaleActions() before build().");
+        }
+        const { vault, connection, signer, vaultPda, pricesAccount } = this.config;
+        const squadsProgram = this.config.squadsProgram ?? syncTransaction_1.SQUADS_PROGRAM_ID;
+        const defaultCU = this.config.computeUnitLimit ?? 1_400_000;
+        const defaultHeap = this.config.heapFrameBytes ?? 256 * 1024;
+        // 1. Price refresh TransactionSet
+        const priceOpts = this.config.priceRefreshOptions ?? {};
+        const priceIxs = await vault.ixsUpdateStrategyVaultPrices(pricesAccount);
+        const priceSet = {
+            label: priceOpts.label ?? "price-refresh",
+            instructions: buildComputeBudgetIxs(priceOpts.computeUnitLimit ?? defaultCU, priceOpts.heapFrameBytes ?? defaultHeap, priceOpts.priorityFee).concat(priceIxs),
+            signers: [],
+            addressLookupTableAddresses: vault.state.addressLookupTable
+                ? [vault.state.addressLookupTable]
+                : [],
+        };
+        // 2. Per-step sync TransactionSets
+        const transactionSets = [priceSet];
+        const allAltAddresses = new Set(priceSet.addressLookupTableAddresses.map((a) => a.toBase58()));
+        for (const step of this.steps) {
+            const syncResult = await (0, vault_interaction_1.createVaultSyncTransaction)({
+                instructions: step.instructions,
+                owner: vaultPda,
+                connection,
+                vaultPda,
+                signer,
+                vaultAddress: vault.selfAddress,
+                squadsProgram,
+            });
+            if (syncResult.setupInstructions.length > 0) {
+                transactionSets.push({
+                    label: `${step.label}-setup`,
+                    instructions: [
+                        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 }),
+                        ...syncResult.setupInstructions,
+                    ],
+                    signers: [],
+                    addressLookupTableAddresses: [],
+                });
+            }
+            const stepCU = step.options.computeUnitLimit ?? defaultCU;
+            const stepHeap = step.options.heapFrameBytes ?? defaultHeap;
+            const syncSet = {
+                label: step.label,
+                instructions: [
+                    ...buildComputeBudgetIxs(stepCU, stepHeap, step.options.priorityFee),
+                    ...syncResult.preInstructions,
+                    syncResult.instruction,
+                    ...syncResult.postInstructions,
+                ],
+                signers: syncResult.signers,
+                addressLookupTableAddresses: [
+                    ...syncResult.addressLookupTableAddresses,
+                    ...(vault.state.addressLookupTable ? [vault.state.addressLookupTable] : []),
+                ],
+            };
+            transactionSets.push(syncSet);
+            for (const alt of syncSet.addressLookupTableAddresses) {
+                allAltAddresses.add(alt.toBase58());
+            }
+        }
+        const lookupTableAddresses = [...allAltAddresses].map((a) => new web3_js_1.PublicKey(a));
+        // Validate transaction sizes — catch oversized txs early with a clear error
+        const altAccounts = await resolveAltAccounts(connection, lookupTableAddresses);
+        for (const txSet of transactionSets) {
+            const txAltAccounts = altAccounts.filter((alt) => txSet.addressLookupTableAddresses.some((addr) => addr.equals(alt.key)));
+            try {
+                const testMsg = new web3_js_1.TransactionMessage({
+                    payerKey: signer,
+                    recentBlockhash: "1".repeat(44),
+                    instructions: txSet.instructions,
+                }).compileToV0Message(txAltAccounts);
+                const testTx = new web3_js_1.VersionedTransaction(testMsg);
+                const serialized = testTx.serialize();
+                if (serialized.length > 1232) {
+                    throw new Error(`Transaction "${txSet.label}" is oversized (${serialized.length} bytes, limit 1232). ` +
+                        `This usually means too many actions were packed into a single addActions() call. ` +
+                        `Split them into separate addActions() calls so each gets its own sync transaction.`);
+                }
+            }
+            catch (e) {
+                if (e instanceof Error && e.message.includes("oversized"))
+                    throw e;
+            }
+        }
+        const labels = transactionSets.map((ts) => ts.label);
+        // Capture state for sendJitoBundle closure
+        const closedConnection = connection;
+        const closedSigner = signer;
+        const closedLookupTableAddresses = lookupTableAddresses;
+        const closedSteps = this.steps;
+        return {
+            transactionSets,
+            lookupTableAddresses,
+            labels,
+            async sendJitoBundle(options) {
+                const resolvedAltAccounts = await resolveAltAccounts(closedConnection, closedLookupTableAddresses);
+                const { blockhash, lastValidBlockHeight } = await closedConnection.getLatestBlockhash();
+                // Auto-create LoopscaleClient if any step needs co-signing
+                const hasLoopscale = closedSteps.some((s) => s.isLoopscale);
+                let loopscaleClient;
+                if (hasLoopscale) {
+                    loopscaleClient = new loopscale_client_1.LoopscaleClient({
+                        connection: closedConnection,
+                        userWallet: closedSigner,
+                    });
+                }
+                const allTxs = [];
+                for (let i = 0; i < transactionSets.length; i++) {
+                    const txSet = transactionSets[i];
+                    const isLast = i === transactionSets.length - 1;
+                    const instructions = [...txSet.instructions];
+                    if (isLast && options.tipLamports > 0) {
+                        instructions.push(createJitoTipIx(options.tipLamports, options.signers[0].publicKey));
+                    }
+                    const txAltAccounts = resolvedAltAccounts.filter((alt) => txSet.addressLookupTableAddresses.some((addr) => addr.equals(alt.key)));
+                    const msg = new web3_js_1.TransactionMessage({
+                        payerKey: options.signers[0].publicKey,
+                        recentBlockhash: blockhash,
+                        instructions,
+                    }).compileToV0Message(txAltAccounts);
+                    let tx = new web3_js_1.VersionedTransaction(msg);
+                    // Co-sign Loopscale steps, sign everything else normally
+                    const step = closedSteps.find((s) => s.label === txSet.label);
+                    if (step?.isLoopscale && loopscaleClient) {
+                        tx.sign([...options.signers, ...txSet.signers]);
+                        tx = await loopscaleClient.coSign(tx);
+                    }
+                    else {
+                        tx.sign([...options.signers, ...txSet.signers]);
+                    }
+                    allTxs.push(tx);
+                }
+                // Custom send escape hatch (for testing)
+                if (options.customSend) {
+                    const sigs = await options.customSend(allTxs, labels);
+                    return { signatures: sigs, bundleId: "" };
+                }
+                const serialized = allTxs.map((tx) => Buffer.from(tx.serialize()));
+                const result = await sendJitoBundleRpc(serialized, options.jitoAuthKey);
+                const commitment = options.commitment ?? "confirmed";
+                if (result.signatures.length > 0) {
+                    await closedConnection.confirmTransaction({ signature: result.signatures[0], blockhash, lastValidBlockHeight }, commitment).catch(() => { });
+                }
+                return result;
+            },
+        };
+    }
+}
+exports.VaultTransactionBuilder = VaultTransactionBuilder;
+// ============================================================================
+// bundleForJito — standalone utility
+// ============================================================================
+/**
+ * Package TransactionSets into Jito-compatible unsigned VersionedTransactions.
+ *
+ * All transactions share the same blockhash and a Jito tip instruction is appended
+ * to the last transaction. The returned transactions are **unsigned** — the caller
+ * is responsible for signing (useful for web app flows where a wallet adapter handles signing).
+ *
+ * For a fully managed sign-and-send flow, use {@link VaultTransactionBuildResult.sendJitoBundle} instead.
+ *
+ * @param transactionSets - Ordered TransactionSets from `builder.build()`.
+ * @param params.connection - Solana RPC connection for ALT resolution and blockhash fetching.
+ * @param params.payer - Public key of the fee payer (used in the V0 message header).
+ * @param params.tipLamports - Jito tip amount in lamports, appended to the last transaction.
+ * @param params.lookupTableAddresses - All ALT addresses from the build result.
+ * @returns Unsigned VersionedTransactions ready for wallet signing.
+ */
+async function bundleForJito(transactionSets, params) {
+    const { connection, payer, tipLamports, lookupTableAddresses } = params;
+    const altAccounts = await resolveAltAccounts(connection, lookupTableAddresses);
+    const { blockhash } = await connection.getLatestBlockhash();
+    const transactions = [];
+    for (let i = 0; i < transactionSets.length; i++) {
+        const txSet = transactionSets[i];
+        const isLast = i === transactionSets.length - 1;
+        const instructions = [...txSet.instructions];
+        if (isLast && tipLamports > 0) {
+            instructions.push(createJitoTipIx(tipLamports, payer));
+        }
+        const txAltAccounts = altAccounts.filter((alt) => txSet.addressLookupTableAddresses.some((addr) => addr.equals(alt.key)));
+        const messageV0 = new web3_js_1.TransactionMessage({
+            payerKey: payer,
+            recentBlockhash: blockhash,
+            instructions,
+        }).compileToV0Message(txAltAccounts);
+        transactions.push(new web3_js_1.VersionedTransaction(messageV0));
+    }
+    return transactions;
+}
+exports.bundleForJito = bundleForJito;
+// ============================================================================
+// Internal helpers
+// ============================================================================
+/** Build compute budget instructions: CU limit + heap frame + optional priority fee. */
+function buildComputeBudgetIxs(computeUnitLimit, heapFrameBytes, priorityFee) {
+    const ixs = [
+        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: computeUnitLimit }),
+        web3_js_1.ComputeBudgetProgram.requestHeapFrame({ bytes: heapFrameBytes }),
+    ];
+    if (priorityFee !== undefined && priorityFee > 0) {
+        ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priorityFee }));
+    }
+    return ixs;
+}
+/** Fetch and resolve AddressLookupTableAccounts from on-chain, filtering nulls. */
+async function resolveAltAccounts(connection, addresses) {
+    const results = await Promise.all(addresses.map((addr) => connection.getAddressLookupTable(addr)));
+    return results
+        .map((r) => r.value)
+        .filter((v) => v !== null);
+}
+/** Create a Jito tip transfer instruction to a random tip address. */
+function createJitoTipIx(tipLamports, payer) {
+    const tipReceiver = JITO_TIP_ADDRESSES[Math.floor(Math.random() * JITO_TIP_ADDRESSES.length)];
+    return web3_js_1.SystemProgram.transfer({
+        fromPubkey: payer,
+        toPubkey: tipReceiver,
+        lamports: BigInt(Math.floor(tipLamports)),
+    });
+}
+/**
+ * Send a bundle of serialized transactions to Jito block engine endpoints.
+ * Fans out to regional endpoints (best-effort) and retries the mainnet endpoint.
+ */
+async function sendJitoBundleRpc(serializedTransactions, authKey) {
+    if (serializedTransactions.length > 5) {
+        throw new Error("Jito bundles support at most 5 transactions");
+    }
+    const signatures = serializedTransactions.map((tx) => {
+        const vtx = web3_js_1.VersionedTransaction.deserialize(tx);
+        return Buffer.from(vtx.signatures[0]).toString("base64");
+    });
+    const requestBody = {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "sendBundle",
+        params: [serializedTransactions.map((tx) => tx.toString("base64")), { encoding: "base64" }],
+    };
+    const headers = { "Content-Type": "application/json" };
+    if (authKey)
+        headers["x-jito-auth"] = authKey;
+    // Fan out to regional endpoints (best-effort, don't await)
+    const regionalPromises = JITO_REGIONAL_URLS.map((url) => fetch(`${url}${JITO_BUNDLES_PATH}`, { method: "POST", headers, body: JSON.stringify(requestBody) })
+        .catch(() => { }));
+    Promise.allSettled(regionalPromises);
+    // Retry mainnet endpoint
+    for (let attempt = 0; attempt < JITO_MAX_RETRIES; attempt++) {
+        try {
+            const response = await fetch(`${JITO_MAINNET_URL}${JITO_BUNDLES_PATH}`, {
+                method: "POST",
+                headers,
+                body: JSON.stringify(requestBody),
+            });
+            const data = (await response.json().catch(() => undefined));
+            if (response.ok && !data?.error && typeof data?.result === "string") {
+                return { bundleId: data.result, signatures };
+            }
+            if (response.status === 400) {
+                return { bundleId: "", signatures };
+            }
+        }
+        catch { }
+        await new Promise((r) => setTimeout(r, JITO_RETRY_DELAY_MS));
+    }
+    return { bundleId: "", signatures };
+}
+// ── ALT auto-extension (reserved for future use) ──
+/**
+ * Auto-extend an address lookup table with all unique accounts from the given instructions.
+ * Batches in groups of 30 addresses (Solana limit per extend instruction).
+ * Waits 2 seconds after extension for ALT propagation.
+ *
+ * @internal Not currently wired into any flow. Reserved for when ALT management
+ * needs to be handled by the builder (e.g., oversized Loopscale transactions).
+ */
+async function autoExtendAlt(connection, lookupTable, authority, instructions) {
+    const seen = new Set();
+    const addresses = [];
+    for (const ix of instructions) {
+        for (const key of [ix.programId, ...ix.keys.map((k) => k.pubkey)]) {
+            const keyStr = key.toBase58();
+            if (!seen.has(keyStr)) {
+                seen.add(keyStr);
+                addresses.push(key);
+            }
+        }
+    }
+    for (let i = 0; i < addresses.length; i += 30) {
+        const batch = addresses.slice(i, i + 30);
+        const extendIx = web3_js_1.AddressLookupTableProgram.extendLookupTable({
+            payer: authority.publicKey,
+            authority: authority.publicKey,
+            lookupTable,
+            addresses: batch,
+        });
+        const { blockhash } = await connection.getLatestBlockhash();
+        const msg = new web3_js_1.TransactionMessage({
+            payerKey: authority.publicKey,
+            recentBlockhash: blockhash,
+            instructions: [extendIx],
+        }).compileToV0Message();
+        const tx = new web3_js_1.VersionedTransaction(msg);
+        tx.sign([authority]);
+        await connection.sendRawTransaction(tx.serialize());
+    }
+    await new Promise((r) => setTimeout(r, 2000));
+}
+//# sourceMappingURL=vaultTransactionBuilder.js.map

package/build/exponentVaults/vaultTransactionBuilder.js.map

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

package/build/flavors.d.ts

@@ -1,7 +1,7 @@
-import { web3 } from "@coral-xyz/anchor";
 import { ExponentFetcher } from "@exponent-labs/exponent-fetcher";
 import { CpiAccountsRaw, Flavor, FlavorDiscriminator, FlavorGeneric, FlavorGenericState, FlavorGenericStateJson, FlavorJitoRestaking, FlavorJitoRestakingState, FlavorJitoRestakingStateJson, FlavorKamino, FlavorKaminoState, FlavorKaminoStateJson, FlavorMarginfi, FlavorMarginfiState, FlavorMarginfiStateJson, FlavorPerena, FlavorPerenaState, FlavorPerenaStateJson } from "@exponent-labs/exponent-types";
 import { Environment } from "./environment";
+import { PublicKey } from "@solana/web3.js";
 export declare function serializeFlavorMarginfi(flavor: FlavorMarginfiState): FlavorMarginfiStateJson;
 export declare function deserializeFlavorMarginfi(flavor: FlavorMarginfiStateJson): FlavorMarginfiState;
 export declare function serializeFlavorKamino(flavor: FlavorKaminoState): FlavorKaminoStateJson;
@@ -20,10 +20,10 @@ export declare function makeFlavorPerenaSync(data: FlavorPerenaState): FlavorPer
 export declare function makeFlavorGenericSync(data: FlavorGenericState, syConfig?: {
     skipWrap?: boolean;
 }): FlavorGeneric;
-export declare function flavorFinder(env: Environment, syProgram: web3.PublicKey): FlavorDiscriminator;
+export declare function flavorFinder(env: Environment, syProgram: PublicKey): FlavorDiscriminator;
 export declare function makeFlavor(fetcher: ExponentFetcher, env: Environment, 
 /** The actual SY program linked to the market */
-syProgram: web3.PublicKey, cpiAccounts: CpiAccountsRaw, syConfig?: {
+syProgram: PublicKey, cpiAccounts: CpiAccountsRaw, syConfig?: {
     skipWrap?: boolean;
 }): Promise<Flavor>;
 export declare function serializeFlavor(flavor: Flavor): FlavorMarginfiStateJson | FlavorKaminoStateJson | FlavorJitoRestakingStateJson | FlavorPerenaStateJson | FlavorGenericStateJson;