@haven-fi/solauto-sdk 1.0.581 → 1.0.583

package/dist/services/solauto/solautoMarginfiClient.js

@@ -0,0 +1,322 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolautoMarginfiClient = void 0;
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const umi_1 = require("@metaplex-foundation/umi");
+const web3_js_1 = require("@solana/web3.js");
+const solautoClient_1 = require("./solautoClient");
+const marginfiAccounts_1 = require("../../constants/marginfiAccounts");
+const generated_1 = require("../../generated");
+const accountUtils_1 = require("../../utils/accountUtils");
+const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfiUtils_1 = require("../../utils/marginfiUtils");
+const solautoUtils_1 = require("../../utils/solautoUtils");
+class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
+    constructor() {
+        super(...arguments);
+        this.lendingPlatform = generated_1.LendingPlatform.Marginfi;
+    }
+    async initialize(args) {
+        await super.initialize(args);
+        this.marginfiGroup = await this.solautoPosition.lendingPool();
+        if (this.selfManaged) {
+            this.marginfiAccount =
+                args.marginfiAccount ??
+                    (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
+        }
+        else {
+            if (this.solautoPosition.exists()) {
+                this.marginfiAccount = this.solautoPosition.lpUserAccount;
+            }
+            else {
+                const accounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, this.solautoPosition.publicKey, this.marginfiGroup, false);
+                const reusableAccounts = accounts.length > 0
+                    ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, accounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => (0, marginfiUtils_1.marginfiAccountEmpty)(x))
+                    : [];
+                this.marginfiAccount =
+                    reusableAccounts.length > 0
+                        ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(reusableAccounts[0].publicKey)
+                        : (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
+            }
+        }
+        this.marginfiAccountPk =
+            "publicKey" in this.marginfiAccount
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccount.publicKey)
+                : this.marginfiAccount;
+        if ("publicKey" in this.marginfiAccount) {
+            this.otherSigners.push(this.marginfiAccount);
+        }
+        this.marginfiSupplyAccounts =
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.solautoPosition.supplyMint().toString()];
+        this.marginfiDebtAccounts =
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.solautoPosition.debtMint().toString()];
+        // TODO: Don't dynamically pull oracle from bank until Marginfi sorts out their price oracle issues.
+        // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
+        //   publicKey(this.marginfiSupplyAccounts.bank),
+        //   publicKey(this.marginfiDebtAccounts.bank),
+        // ]);
+        // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
+        // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
+        this.supplyPriceOracle = new web3_js_1.PublicKey(this.marginfiSupplyAccounts.priceOracle);
+        this.debtPriceOracle = new web3_js_1.PublicKey(this.marginfiDebtAccounts.priceOracle);
+        this.log("Marginfi account:", this.marginfiAccountPk.toString());
+    }
+    defaultLookupTables() {
+        return [marginfiAccounts_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
+    }
+    lutAccountsToAdd() {
+        return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
+    }
+    marginfiAccountInitialize(marginfiAccount) {
+        return (0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
+            marginfiAccount: marginfiAccount,
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            authority: this.signer,
+            feePayer: this.signer,
+        });
+    }
+    openPositionIx(settings, dca) {
+        return super
+            .openPositionIx(settings, dca)
+            .add(this.marginfiOpenPositionIx(settings, dca));
+    }
+    marginfiOpenPositionIx(settings, dca, positionType) {
+        let signerDebtTa = undefined;
+        if (dca) {
+            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
+        }
+        return (0, generated_1.marginfiOpenPosition)(this.umi, {
+            signer: this.signer,
+            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            signerReferralState: (0, umi_1.publicKey)(this.referralState),
+            referredByState: this.referredByState
+                ? (0, umi_1.publicKey)(this.referredByState)
+                : undefined,
+            referredBySupplyTa: this.referredBySupplyTa()
+                ? (0, umi_1.publicKey)(this.referredBySupplyTa())
+                : undefined,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            marginfiAccount: "publicKey" in this.marginfiAccount
+                ? this.marginfiAccount
+                : (0, umi_1.publicKey)(this.marginfiAccount),
+            supplyMint: (0, umi_1.publicKey)(this.solautoPosition.supplyMint()),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
+            debtMint: (0, umi_1.publicKey)(this.solautoPosition.debtMint()),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            signerDebtTa: signerDebtTa,
+            positionType: positionType ?? generated_1.PositionType.Leverage,
+            positionData: {
+                positionId: this.positionId,
+                settings: settings ?? null,
+                dca: dca ?? null,
+            },
+        });
+    }
+    closePositionIx() {
+        return (0, generated_1.closePosition)(this.umi, {
+            signer: this.signer,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            signerSupplyTa: (0, umi_1.publicKey)(this.signerSupplyTa),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            signerDebtTa: (0, umi_1.publicKey)(this.signerDebtTa),
+            lpUserAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+        });
+    }
+    refreshIx() {
+        return (0, generated_1.marginfiRefreshData)(this.umi, {
+            signer: this.signer,
+            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+        });
+    }
+    protocolInteractionIx(args) {
+        let tx = super.protocolInteractionIx(args);
+        if (this.selfManaged) {
+            return tx.add(this.marginfiProtocolInteractionIx(args));
+        }
+        else {
+            return tx.add(this.marginfiSolautoProtocolInteractionIx(args));
+        }
+    }
+    marginfiProtocolInteractionIx(args) {
+        switch (args.__kind) {
+            case "Deposit": {
+                return (0, marginfi_sdk_1.lendingAccountDeposit)(this.umi, {
+                    amount: args.fields[0],
+                    signer: this.signer,
+                    signerTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault),
+                });
+            }
+            case "Borrow": {
+                return (0, marginfi_sdk_1.lendingAccountBorrow)(this.umi, {
+                    amount: args.fields[0],
+                    signer: this.signer,
+                    destinationTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority),
+                });
+            }
+            case "Repay": {
+                return (0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
+                    amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+                    repayAll: args.fields[0].__kind === "All" ? true : false,
+                    signer: this.signer,
+                    signerTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault),
+                });
+            }
+            case "Withdraw": {
+                return (0, marginfi_sdk_1.lendingAccountWithdraw)(this.umi, {
+                    amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+                    withdrawAll: args.fields[0].__kind === "All" ? true : false,
+                    signer: this.signer,
+                    destinationTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority),
+                });
+            }
+        }
+    }
+    marginfiSolautoProtocolInteractionIx(args) {
+        let positionSupplyTa = undefined;
+        let vaultSupplyTa = undefined;
+        let supplyVaultAuthority = undefined;
+        if (args.__kind === "Deposit" || args.__kind === "Withdraw") {
+            positionSupplyTa = (0, umi_1.publicKey)(args.__kind === "Withdraw" || this.selfManaged
+                ? this.signerSupplyTa
+                : this.positionSupplyTa);
+            vaultSupplyTa = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault);
+            supplyVaultAuthority = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority);
+        }
+        let positionDebtTa = undefined;
+        let vaultDebtTa = undefined;
+        let debtVaultAuthority = undefined;
+        if (args.__kind === "Borrow" || args.__kind === "Repay") {
+            positionDebtTa = (0, umi_1.publicKey)(args.__kind === "Borrow" || this.selfManaged
+                ? this.signerDebtTa
+                : this.positionDebtTa);
+            vaultDebtTa = (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault);
+            debtVaultAuthority = (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority);
+        }
+        let supplyPriceOracle = undefined;
+        let debtPriceOracle = undefined;
+        if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
+            supplyPriceOracle = (0, umi_1.publicKey)(this.supplyPriceOracle);
+            debtPriceOracle = (0, umi_1.publicKey)(this.debtPriceOracle);
+        }
+        return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
+            signer: this.signer,
+            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            supplyPriceOracle,
+            positionSupplyTa,
+            vaultSupplyTa,
+            supplyVaultAuthority,
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            debtPriceOracle,
+            positionDebtTa,
+            vaultDebtTa,
+            debtVaultAuthority,
+            solautoAction: args,
+        });
+    }
+    rebalanceIx(rebalanceStep, data) {
+        const inputIsSupply = new web3_js_1.PublicKey(data.swapQuote.inputMint).equals(this.solautoPosition.supplyMint());
+        const outputIsSupply = new web3_js_1.PublicKey(data.swapQuote.outputMint).equals(this.solautoPosition.supplyMint());
+        const preSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PreSwap;
+        const postSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PostSwap;
+        const needSupplyAccounts = (inputIsSupply && preSwapRebalance) ||
+            (outputIsSupply && postSwapRebalance) ||
+            (inputIsSupply && data.flashLoan !== undefined && postSwapRebalance);
+        const needDebtAccounts = (!inputIsSupply && preSwapRebalance) ||
+            (!outputIsSupply && postSwapRebalance) ||
+            (!inputIsSupply && data.flashLoan !== undefined && postSwapRebalance);
+        const isFirstRebalance = (preSwapRebalance && (0, solautoUtils_1.hasFirstRebalance)(data.rebalanceType)) ||
+            (postSwapRebalance &&
+                data.rebalanceType === generated_1.SolautoRebalanceType.FLSwapThenRebalance);
+        const addAuthorityTas = this.selfManaged || data.values.tokenBalanceChange !== undefined;
+        return (0, generated_1.marginfiRebalance)(this.umi, {
+            signer: this.signer,
+            marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
+            ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
+            solautoFeesTa: (0, umi_1.publicKey)(data.values.rebalanceDirection === generated_1.RebalanceDirection.Boost
+                ? this.solautoFeesSupplyTa
+                : this.solautoFeesDebtTa),
+            authorityReferralState: (0, umi_1.publicKey)(this.referralState),
+            referredByTa: this.referredByState
+                ? (0, umi_1.publicKey)(data.values.rebalanceDirection === generated_1.RebalanceDirection.Boost
+                    ? this.referredBySupplyTa()
+                    : this.referredByDebtTa())
+                : undefined,
+            positionAuthority: data.values.tokenBalanceChange !== undefined
+                ? (0, umi_1.publicKey)(this.authority)
+                : undefined,
+            solautoPosition: (0, umi_1.publicKey)(this.solautoPosition.publicKey),
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+            intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), new web3_js_1.PublicKey(data.swapQuote.inputMint))),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
+            authoritySupplyTa: addAuthorityTas
+                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.solautoPosition.supplyMint()))
+                : undefined,
+            vaultSupplyTa: needSupplyAccounts
+                ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
+                : undefined,
+            supplyVaultAuthority: needSupplyAccounts
+                ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority)
+                : undefined,
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            authorityDebtTa: addAuthorityTas
+                ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.solautoPosition.debtMint()))
+                : undefined,
+            vaultDebtTa: needDebtAccounts
+                ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)
+                : undefined,
+            debtVaultAuthority: needDebtAccounts
+                ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority)
+                : undefined,
+            rebalanceType: data.rebalanceType,
+            targetLiqUtilizationRateBps: data.targetLiqUtilizationRateBps ?? null,
+            swapInAmountBaseUnit: isFirstRebalance
+                ? parseInt(data.swapQuote.inAmount)
+                : null,
+            swapType: data.swapQuote.swapMode === "ExactOut" && isFirstRebalance
+                ? generated_1.SwapType.ExactOut
+                : null,
+            flashLoanFeeBps: data.flashLoan?.flFeeBps && isFirstRebalance
+                ? data.flashLoan.flFeeBps
+                : null,
+        });
+    }
+}
+exports.SolautoMarginfiClient = SolautoMarginfiClient;

package/dist/{clients → services/solauto}/txHandler.d.ts

@@ -1,14 +1,23 @@
 import { Signer, Umi } from "@metaplex-foundation/umi";
 import { Connection, PublicKey } from "@solana/web3.js";
+import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
+export interface TxHandlerProps {
+    signer?: Signer;
+    wallet?: WalletAdapter;
+    rpcUrl: string;
+    showLogs?: boolean;
+    programId?: PublicKey;
+    wsEndpoint?: string;
+}
 export declare abstract class TxHandler {
     rpcUrl: string;
+    showLogs: boolean;
     programId: PublicKey;
-    wsEndpoint?: string | undefined;
     connection: Connection;
     umi: Umi;
     signer: Signer;
     otherSigners: Signer[];
-    constructor(rpcUrl: string, localTest?: boolean, programId?: PublicKey, wsEndpoint?: string | undefined);
+    constructor(props: TxHandlerProps);
     log(...args: any[]): void;
     abstract defaultLookupTables(): string[];
     abstract resetLiveTxUpdates(success?: boolean): Promise<void>;

package/dist/services/solauto/txHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AAEzD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,QAAQ,UAAS;IACjB,SAAS,YAAwB;IAEjC,UAAU,EAAG,UAAU,CAAC;IACxB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAEvB,KAAK,EAAE,cAAc;IAiCjC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}

package/dist/services/solauto/txHandler.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TxHandler = void 0;
+const umi_1 = require("@metaplex-foundation/umi");
+const utils_1 = require("../../utils");
+const constants_1 = require("../../constants");
+const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
+class TxHandler {
+    constructor(props) {
+        this.showLogs = false;
+        this.programId = constants_1.SOLAUTO_PROD_PROGRAM;
+        this.otherSigners = [];
+        if (props.programId !== undefined) {
+            this.programId = props.programId;
+        }
+        this.rpcUrl = props.rpcUrl;
+        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.rpcUrl, this.programId, props.wsEndpoint);
+        this.connection = connection;
+        this.umi = umi;
+        if (!props.signer && !props.wallet) {
+            throw new Error("Signer or wallet must be provided");
+        }
+        this.umi = this.umi.use(props.signer
+            ? (0, umi_1.signerIdentity)(props.signer, true)
+            : (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(props.wallet, true));
+        this.signer = this.umi.identity;
+        if (props.showLogs !== undefined) {
+            this.showLogs = props.showLogs;
+        }
+        if (!globalThis.SHOW_LOGS && this.showLogs) {
+            globalThis.SHOW_LOGS = Boolean(this.showLogs);
+        }
+    }
+    log(...args) {
+        (0, utils_1.consoleLog)(...args);
+    }
+}
+exports.TxHandler = TxHandler;

package/dist/services/swap/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./jupSwapManager";
+//# sourceMappingURL=index.d.ts.map

package/dist/services/swap/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/swap/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/dist/{utils/solauto → services/swap}/index.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./generalUtils"), exports);
-__exportStar(require("./rebalanceUtils"), exports);
+__exportStar(require("./jupSwapManager"), exports);

package/dist/services/swap/jupSwapManager.d.ts

@@ -0,0 +1,37 @@
+import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
+import { QuoteResponse } from "@jup-ag/api";
+import { PublicKey } from "@solana/web3.js";
+import { TransactionItemInputs } from "../../types";
+export interface SwapInput {
+    inputMint: PublicKey;
+    outputMint: PublicKey;
+    amount: bigint;
+    exactIn?: boolean;
+    exactOut?: boolean;
+}
+export interface SwapParams extends SwapInput {
+    destinationWallet: PublicKey;
+    slippageIncFactor?: number;
+    wrapAndUnwrapSol?: boolean;
+}
+export interface JupSwapTransactionData {
+    jupQuote: QuoteResponse;
+    setupInstructions: TransactionBuilder;
+    swapIx: TransactionBuilder;
+    cleanupIx: TransactionBuilder;
+    lookupTableAddresses: string[];
+}
+export declare class JupSwapManager {
+    private signer;
+    jupApi: import("@jup-ag/api").DefaultApi;
+    jupQuote: QuoteResponse | undefined;
+    constructor(signer: Signer);
+    getQuote(data: SwapInput): Promise<QuoteResponse>;
+    private getJupInstructions;
+    priceImpactBps(): number;
+    private adaptSlippageToPriceImpact;
+    private addInAmountSlippagePadding;
+    getJupSwapTxData(data: SwapParams): Promise<JupSwapTransactionData>;
+    getSwapTx(data: SwapParams): Promise<TransactionItemInputs>;
+}
+//# sourceMappingURL=jupSwapManager.d.ts.map

package/dist/services/swap/jupSwapManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAqChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}

package/dist/services/swap/jupSwapManager.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JupSwapManager = void 0;
+const umi_1 = require("@metaplex-foundation/umi");
+const api_1 = require("@jup-ag/api");
+const solanaUtils_1 = require("../../utils/solanaUtils");
+const numberUtils_1 = require("../../utils/numberUtils");
+const accountUtils_1 = require("../../utils/accountUtils");
+const utils_1 = require("../../utils");
+class JupSwapManager {
+    constructor(signer) {
+        this.signer = signer;
+        this.jupApi = (0, api_1.createJupiterApiClient)();
+        this.jupQuote = undefined;
+    }
+    async getQuote(data) {
+        return await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum) => await this.jupApi.quoteGet({
+            amount: Number(data.amount),
+            inputMint: data.inputMint.toString(),
+            outputMint: data.outputMint.toString(),
+            swapMode: data.exactOut
+                ? "ExactOut"
+                : data.exactIn
+                    ? "ExactIn"
+                    : undefined,
+            slippageBps: 10,
+            maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
+        }), 3, 200);
+    }
+    async getJupInstructions(data) {
+        if (!this.jupQuote) {
+            throw new Error("Fetch a quote first before getting Jupiter instructions");
+        }
+        const instructions = await (0, utils_1.retryWithExponentialBackoff)(async () => {
+            const res = await this.jupApi.swapInstructionsPost({
+                swapRequest: {
+                    userPublicKey: this.signer.publicKey.toString(),
+                    quoteResponse: this.jupQuote,
+                    wrapAndUnwrapSol: data.wrapAndUnwrapSol ?? false,
+                    useTokenLedger: !data.exactOut && !data.exactIn,
+                    destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(data.destinationWallet, data.outputMint).toString(),
+                },
+            });
+            if (!res) {
+                throw new Error("No instructions retrieved");
+            }
+            return res;
+        }, 4, 200);
+        if (!instructions.swapInstruction) {
+            throw new Error("No swap instruction was returned by Jupiter");
+        }
+        return instructions;
+    }
+    priceImpactBps() {
+        return Math.round((0, numberUtils_1.toBps)(parseFloat(this.jupQuote.priceImpactPct))) + 1;
+    }
+    adaptSlippageToPriceImpact(slippageIncFactor) {
+        const finalPriceSlippageBps = Math.round(Math.max(20, this.jupQuote.slippageBps, this.priceImpactBps()) *
+            (1 + slippageIncFactor));
+        this.jupQuote.slippageBps = finalPriceSlippageBps;
+    }
+    addInAmountSlippagePadding() {
+        (0, utils_1.consoleLog)("Raw inAmount:", this.jupQuote.inAmount);
+        const inc = Math.max((0, numberUtils_1.fromBps)(this.priceImpactBps()) * 1.1, (0, numberUtils_1.fromBps)(this.jupQuote.slippageBps) * 0.1);
+        (0, utils_1.consoleLog)("Inc:", inc);
+        this.jupQuote.inAmount = Math.round(parseInt(this.jupQuote.inAmount) +
+            parseInt(this.jupQuote.inAmount) * inc).toString();
+        (0, utils_1.consoleLog)("Increased inAmount:", this.jupQuote.inAmount);
+    }
+    async getJupSwapTxData(data) {
+        if (!this.jupQuote) {
+            this.jupQuote = await this.getQuote(data);
+        }
+        if (data.slippageIncFactor) {
+            this.adaptSlippageToPriceImpact(data.slippageIncFactor);
+        }
+        (0, utils_1.consoleLog)("Quote:", this.jupQuote);
+        const instructions = await this.getJupInstructions(data);
+        if (data.exactOut) {
+            this.addInAmountSlippagePadding();
+        }
+        return {
+            jupQuote: this.jupQuote,
+            lookupTableAddresses: instructions.addressLookupTableAddresses,
+            setupInstructions: (0, umi_1.transactionBuilder)((instructions.setupInstructions ?? []).map((ix) => (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(ix)))),
+            swapIx: (0, umi_1.transactionBuilder)([
+                (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.swapInstruction)),
+            ]),
+            cleanupIx: (0, umi_1.transactionBuilder)(instructions.cleanupInstruction
+                ? [
+                    (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.cleanupInstruction)),
+                ]
+                : []),
+        };
+    }
+    async getSwapTx(data) {
+        const swapData = await this.getJupSwapTxData(data);
+        return {
+            tx: (0, umi_1.transactionBuilder)().add([
+                swapData.setupInstructions,
+                swapData.swapIx,
+                swapData.cleanupIx,
+            ]),
+            lookupTableAddresses: swapData.lookupTableAddresses,
+        };
+    }
+}
+exports.JupSwapManager = JupSwapManager;

package/dist/services/transactions/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}

package/dist/{transactions → services/transactions}/transactionUtils.d.ts

@@ -1,12 +1,10 @@
 import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { SolautoClient } from "../clients/solautoClient";
-import { ReferralStateManager } from "../clients";
-import { TransactionItemInputs } from "../types";
+import { SolautoClient } from "../solauto/solautoClient";
+import { ReferralStateManager } from "..";
+import { TransactionItemInputs } from "../../types";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
-export declare function requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
-export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<TransactionItemInputs | undefined>;
 export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<TransactionItemInputs | undefined>;
 export declare function getErrorInfo(umi: Umi, txs: TransactionBuilder[], error: Error, simulationSuccessful?: boolean): {
     errorName: string | undefined;

package/dist/services/transactions/transactionUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAsBzD,OAAO,EAAkB,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAM1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAyLpD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA6LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA6G/B"}