@haven-fi/solauto-sdk 1.0.627 → 1.0.628

package/README.md

@@ -2,36 +2,14 @@
 
 Solauto is a program on the Solana blockchain that lets you manage leveraged longs & shorts on auto-pilot to maximize your gains and eliminate the risk of liquidation. The typescript SDK is made for interacting with the Solauto program. This SDK provides tools for managing, & reading Solauto state data, as well as executing transactions.
 
-## Installation
-
-```bash
-npm install @haven-fi/solauto-sdk
-# or
-yarn add @haven-fi/solauto-sdk
-# or
-pnpm add @haven-fi/solauto-sdk
-```
-
 ## Basic Usage
 
 ```typescript
 import { PublicKey } from "@solana/web3.js";
-import {
-  getClient,
-  LendingPlatform,
-  USDC,
-  SolautoSettingsParametersInpArgs,
-  maxBoostToBps,
-  maxRepayToBps,
-  fetchTokenPrices,
-  TransactionItem,
-  solautoAction,
-  RebalanceTxBuilder,
-  TransactionsManager,
-} from "@haven-fi/solauto-sdk";
+import * as solauto from "@haven-fi/solauto-sdk";
 
 // Initialize the client
-const client = getClient(LendingPlatform.MARGINFI, {
+const client = solauto.getClient(solauto.LendingPlatform.MARGINFI, {
   signer: yourSigner,
   rpcUrl: "[YOUR_RPC_URL]",
 });
@@ -50,66 +28,46 @@ await client.initialize({
 // Open a position with custom settings
 const [maxLtvBps, liqThresholdBps] =
   await client.pos.maxLtvAndLiqThresholdBps();
-const settings: SolautoSettingsParametersInpArgs = {
-  boostToBps: maxBoostToBps(maxLtvBps, liqThresholdBps),
+const settings: solauto.SolautoSettingsParametersInpArgs = {
+  boostToBps: solauto.maxBoostToBps(maxLtvBps, liqThresholdBps),
   boostGap: 50,
-  repayToBps: maxRepayToBps(maxLtvBps, liqThresholdBps),
+  repayToBps: solauto.maxRepayToBps(maxLtvBps, liqThresholdBps),
   repayGap: 50,
 };
 
-const [supplyPrice, debtPrice] = await fetchTokenPrices([supplyMint, debtMint]);
-
-const transactionItems: TransactionItem[] = [];
-
-transactionItems.push(
-  new TransactionItem(async () => {
-    return {
-      tx: client.openPositionIx(settings),
-    };
-  }, "open position")
-);
-
-const debtUsd = withFlashLoan ? 60 : 10;
-transactionItems.push(
-  new TransactionItem(async () => {
-    return {
-      tx: client.protocolInteractionIx(
-        solautoAction("Borrow", [
-          toBaseUnit(debtUsd / debtPrice, client.pos.debtMintInfo().decimals),
-        ])
-      ),
-    };
-  }, "borrow")
-);
-
-transactionItems.push(
-  new TransactionItem(
-    async (attemptNum) =>
-      await new RebalanceTxBuilder(client, 0).buildRebalanceTx(attemptNum),
-    "rebalance"
-  )
-);
-
-transactionItems.push(
-  new TransactionItem(
-    async () => ({
-      tx: client.protocolInteractionIx(
-        solautoAction("Withdraw", [{ __kind: "All" }])
-      ),
-    }),
-    "withdraw"
-  )
-);
-
-transactionItems.push(
-  new TransactionItem(
-    async () => ({
-      tx: client.closePositionIx(),
-    }),
-    "close position"
-  )
+const supplyUsdToDeposit = 100;
+const debtUsdToBorrow = 60;
+const [supplyPrice, debtPrice] = await solauto.fetchTokenPrices([
+  supplyMint,
+  debtMint,
+]);
+
+const transactionItems = [
+  // Open position
+  solauto.openSolautoPosition(client, settings),
+  // Deposit supply (SOL) transaction
+  solauto.deposit(
+    client,
+    toBaseUnit(
+      supplyUsdToDeposit / supplyPrice,
+      client.pos.supplyMintInfo().decimals
+    )
+  ),
+  // Borrow debt (USDC) transaction
+  solauto.borrow(
+    client,
+    toBaseUnit(debtUsdToBorrow / debtPrice, client.pos.debtMintInfo().decimals)
+  ),
+  // Rebalance to 0 LTV (repays all debt using collateral)
+  solauto.rebalance(client, 0),
+  // Withdraw remaining supply in position
+  solauto.withdraw(client, "All"),
+  // Close position
+  solauto.closeSolautoPosition(client),
+];
+
+// Send all transactions atomically
+const statuses = await new solauto.TransactionsManager(client).clientSend(
+  transactionItems
 );
-
-const txManager = new TransactionsManager(client);
-const statuses = await txManager.clientSend(transactionItems);
 ```

package/dist/utils/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./accountUtils";
 export * from "./generalUtils";
+export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}

package/dist/utils/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./accountUtils"), exports);
 __exportStar(require("./generalUtils"), exports);
+__exportStar(require("./instructionUtils"), exports);
 __exportStar(require("./jitoUtils"), exports);
 __exportStar(require("./jupiterUtils"), exports);
 __exportStar(require("./marginfiUtils"), exports);

package/dist/utils/instructionUtils.d.ts

@@ -0,0 +1,15 @@
+import { OptionOrNullable } from "@metaplex-foundation/umi";
+import { DCASettingsInpArgs, SolautoSettingsParametersInpArgs } from "../generated";
+import { SolautoClient, TransactionItem } from "../services";
+import { PublicKey } from "@solana/web3.js";
+export declare function openSolautoPosition(client: SolautoClient, settingParams: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionItem;
+export declare function closeSolautoPosition(client: SolautoClient): TransactionItem;
+export declare function updateSolautoPosition(client: SolautoClient, settings: OptionOrNullable<SolautoSettingsParametersInpArgs>, dca: OptionOrNullable<DCASettingsInpArgs>): TransactionItem;
+export declare function cancelSolautoDca(client: SolautoClient): TransactionItem;
+export declare function deposit(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
+export declare function borrow(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
+export declare function withdraw(client: SolautoClient, amount: "All" | bigint): TransactionItem;
+export declare function repay(client: SolautoClient, amount: "All" | bigint): TransactionItem;
+export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number): TransactionItem;
+export declare function swapThenDeposit(client: SolautoClient, depositMint: PublicKey, depositAmountBaseUnit: bigint): TransactionItem[];
+//# sourceMappingURL=instructionUtils.d.ts.map

package/dist/utils/instructionUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAcrE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAUrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBA2C9B"}

package/dist/utils/instructionUtils.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openSolautoPosition = openSolautoPosition;
+exports.closeSolautoPosition = closeSolautoPosition;
+exports.updateSolautoPosition = updateSolautoPosition;
+exports.cancelSolautoDca = cancelSolautoDca;
+exports.deposit = deposit;
+exports.borrow = borrow;
+exports.withdraw = withdraw;
+exports.repay = repay;
+exports.rebalance = rebalance;
+exports.swapThenDeposit = swapThenDeposit;
+const umi_1 = require("@metaplex-foundation/umi");
+const services_1 = require("../services");
+const generalUtils_1 = require("./generalUtils");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+function openSolautoPosition(client, settingParams, dca) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.openPositionIx(settingParams, dca),
+    }), "open position");
+}
+function closeSolautoPosition(client) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.closePositionIx(),
+    }), "close position");
+}
+function updateSolautoPosition(client, settings, dca) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.updatePositionIx({
+            positionId: client.positionId,
+            settings,
+            dca,
+        }),
+    }), "update position");
+}
+function cancelSolautoDca(client) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.cancelDCAIx(),
+    }), "cancel DCA");
+}
+function deposit(client, baseUnitAmount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Deposit",
+            fields: [baseUnitAmount],
+        }),
+    }), "deposit");
+}
+function borrow(client, baseUnitAmount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Borrow",
+            fields: [baseUnitAmount],
+        }),
+    }), "borrow");
+}
+function withdraw(client, amount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Withdraw",
+            fields: [
+                amount === "All"
+                    ? { __kind: "All" }
+                    : { __kind: "Some", fields: [amount] },
+            ],
+        }),
+    }), "withdraw");
+}
+function repay(client, amount) {
+    return new services_1.TransactionItem(async () => ({
+        tx: client.protocolInteractionIx({
+            __kind: "Repay",
+            fields: [
+                amount === "All"
+                    ? { __kind: "All" }
+                    : { __kind: "Some", fields: [amount] },
+            ],
+        }),
+    }), "repay");
+}
+function rebalance(client, targetLiqUtilizationRateBps) {
+    return new services_1.TransactionItem(async (attemptNum) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps).buildRebalanceTx(attemptNum), "rebalance");
+}
+function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
+    return [
+        new services_1.TransactionItem(async () => {
+            const memeSwap = (0, generalUtils_1.tokenInfo)(client.pos.supplyMint()).isMeme;
+            const swapInput = {
+                inputMint: depositMint,
+                outputMint: client.pos.supplyMint(),
+                amount: depositAmountBaseUnit,
+                exactIn: true,
+                slippageBps: memeSwap ? 300 : 50,
+            };
+            const jupSwapManager = new services_1.JupSwapManager(client.signer);
+            const { setupIx, swapIx, cleanupIx, lookupTableAddresses } = await jupSwapManager.getJupSwapTxData({
+                ...swapInput,
+                destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey),
+                wrapAndUnwrapSol: true,
+            });
+            client.contextUpdates.new({
+                type: "jupSwap",
+                value: jupSwapManager.jupQuote,
+            });
+            return {
+                tx: (0, umi_1.transactionBuilder)().add([setupIx, swapIx, cleanupIx]),
+                lookupTableAddresses,
+                orderPrio: -1,
+            };
+        }, "swap"),
+        new services_1.TransactionItem(async () => {
+            const quoteOutAmount = client.contextUpdates.jupSwap?.outAmount;
+            return {
+                tx: (0, umi_1.transactionBuilder)().add(client.protocolInteractionIx({
+                    __kind: "Deposit",
+                    fields: [BigInt(Math.round(parseInt(quoteOutAmount) * 0.995))],
+                })),
+            };
+        }, "deposit"),
+    ];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.627",
+  "version": "1.0.628",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/index.ts

@@ -1,5 +1,6 @@
 export * from "./accountUtils";
 export * from "./generalUtils";
+export * from "./instructionUtils";
 export * from "./jitoUtils";
 export * from "./jupiterUtils";
 export * from "./marginfiUtils";

package/src/utils/instructionUtils.ts

@@ -0,0 +1,181 @@
+import { OptionOrNullable, transactionBuilder } from "@metaplex-foundation/umi";
+import {
+  DCASettingsInpArgs,
+  SolautoSettingsParametersInpArgs,
+} from "../generated";
+import {
+  JupSwapManager,
+  RebalanceTxBuilder,
+  SolautoClient,
+  SwapInput,
+  TransactionItem,
+} from "../services";
+import { PublicKey } from "@solana/web3.js";
+import { tokenInfo } from "./generalUtils";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+
+export function openSolautoPosition(
+  client: SolautoClient,
+  settingParams: SolautoSettingsParametersInpArgs,
+  dca?: DCASettingsInpArgs
+) {
+  return new TransactionItem(
+    async () => ({
+      tx: client!.openPositionIx(settingParams, dca),
+    }),
+    "open position"
+  );
+}
+
+export function closeSolautoPosition(client: SolautoClient) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.closePositionIx(),
+    }),
+    "close position"
+  );
+}
+
+export function updateSolautoPosition(
+  client: SolautoClient,
+  settings: OptionOrNullable<SolautoSettingsParametersInpArgs>,
+  dca: OptionOrNullable<DCASettingsInpArgs>
+) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.updatePositionIx({
+        positionId: client.positionId,
+        settings,
+        dca,
+      }),
+    }),
+    "update position"
+  );
+}
+
+export function cancelSolautoDca(client: SolautoClient) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.cancelDCAIx(),
+    }),
+    "cancel DCA"
+  );
+}
+
+export function deposit(client: SolautoClient, baseUnitAmount: bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Deposit",
+        fields: [baseUnitAmount],
+      }),
+    }),
+    "deposit"
+  );
+}
+
+export function borrow(client: SolautoClient, baseUnitAmount: bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Borrow",
+        fields: [baseUnitAmount],
+      }),
+    }),
+    "borrow"
+  );
+}
+
+export function withdraw(client: SolautoClient, amount: "All" | bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Withdraw",
+        fields: [
+          amount === "All"
+            ? { __kind: "All" }
+            : { __kind: "Some", fields: [amount] },
+        ],
+      }),
+    }),
+    "withdraw"
+  );
+}
+
+export function repay(client: SolautoClient, amount: "All" | bigint) {
+  return new TransactionItem(
+    async () => ({
+      tx: client.protocolInteractionIx({
+        __kind: "Repay",
+        fields: [
+          amount === "All"
+            ? { __kind: "All" }
+            : { __kind: "Some", fields: [amount] },
+        ],
+      }),
+    }),
+    "repay"
+  );
+}
+
+export function rebalance(
+  client: SolautoClient,
+  targetLiqUtilizationRateBps?: number
+) {
+  return new TransactionItem(
+    async (attemptNum) =>
+      await new RebalanceTxBuilder(
+        client,
+        targetLiqUtilizationRateBps
+      ).buildRebalanceTx(attemptNum),
+    "rebalance"
+  );
+}
+
+export function swapThenDeposit(
+  client: SolautoClient,
+  depositMint: PublicKey,
+  depositAmountBaseUnit: bigint
+) {
+  return [
+    new TransactionItem(async () => {
+      const memeSwap = tokenInfo(client.pos.supplyMint()).isMeme;
+      const swapInput: SwapInput = {
+        inputMint: depositMint,
+        outputMint: client.pos.supplyMint(),
+        amount: depositAmountBaseUnit,
+        exactIn: true,
+        slippageBps: memeSwap ? 300 : 50,
+      };
+      const jupSwapManager = new JupSwapManager(client.signer);
+      const { setupIx, swapIx, cleanupIx, lookupTableAddresses } =
+        await jupSwapManager.getJupSwapTxData({
+          ...swapInput,
+          destinationWallet: toWeb3JsPublicKey(client.signer.publicKey),
+          wrapAndUnwrapSol: true,
+        });
+
+      client.contextUpdates.new({
+        type: "jupSwap",
+        value: jupSwapManager.jupQuote!,
+      });
+
+      return {
+        tx: transactionBuilder().add([setupIx, swapIx, cleanupIx]),
+        lookupTableAddresses,
+        orderPrio: -1,
+      };
+    }, "swap"),
+    new TransactionItem(async () => {
+      const quoteOutAmount = client.contextUpdates.jupSwap?.outAmount;
+      return {
+        tx: transactionBuilder().add(
+          client.protocolInteractionIx({
+            __kind: "Deposit",
+            fields: [BigInt(Math.round(parseInt(quoteOutAmount!) * 0.995))],
+          })
+        ),
+      };
+    }, "deposit"),
+  ];
+}

package/tests/transactions/shared.ts

@@ -18,6 +18,12 @@ import {
   TransactionItem,
   TransactionsManager,
   USDC,
+  deposit,
+  openSolautoPosition,
+  borrow,
+  rebalance,
+  withdraw,
+  closeSolautoPosition,
 } from "../../src";
 
 export async function e2eTransactionTest(
@@ -51,77 +57,27 @@ export async function e2eTransactionTest(
     repayGap: 50,
   };
 
-  const transactionItems: TransactionItem[] = [];
-
-  transactionItems.push(
-    new TransactionItem(async () => {
-      return {
-        tx: client.openPositionIx(settings),
-      };
-    }, "open position")
-  );
-
+  const supplyUsd = 100;
+  const debtUsd = withFlashLoan ? 60 : 10;
   const [supplyPrice, debtPrice] = await fetchTokenPrices([
     supplyMint,
     debtMint,
   ]);
 
-  const supplyUsd = 100;
-  transactionItems.push(
-    new TransactionItem(async () => {
-      return {
-        tx: client.protocolInteractionIx(
-          solautoAction("Deposit", [
-            toBaseUnit(
-              supplyUsd / supplyPrice,
-              client.pos.supplyMintInfo().decimals
-            ),
-          ])
-        ),
-      };
-    }, "deposit")
-  );
-
-  const debtUsd = withFlashLoan ? 60 : 10;
-  transactionItems.push(
-    new TransactionItem(async () => {
-      return {
-        tx: client.protocolInteractionIx(
-          solautoAction("Borrow", [
-            toBaseUnit(debtUsd / debtPrice, client.pos.debtMintInfo().decimals),
-          ])
-        ),
-      };
-    }, "borrow")
-  );
-
-  transactionItems.push(
-    new TransactionItem(
-      async (attemptNum) =>
-        await new RebalanceTxBuilder(client, 0).buildRebalanceTx(attemptNum),
-      "rebalance"
-    )
-  );
-
-  transactionItems.push(
-    new TransactionItem(
-      async () => ({
-        tx: client.protocolInteractionIx(
-          solautoAction("Withdraw", [{ __kind: "All" }])
-        ),
-      }),
-      "withdraw"
-    )
-  );
-
-  transactionItems.push(
-    new TransactionItem(
-      async () => ({
-        tx: client.closePositionIx(),
-      }),
-      "close position"
-    )
-  );
+  const transactionItems = [
+    openSolautoPosition(client, settings),
+    deposit(
+      client,
+      toBaseUnit(supplyUsd / supplyPrice, client.pos.supplyMintInfo().decimals)
+    ),
+    borrow(
+      client,
+      toBaseUnit(debtUsd / debtPrice, client.pos.debtMintInfo().decimals)
+    ),
+    rebalance(client, 0),
+    withdraw(client, "All"),
+    closeSolautoPosition(client),
+  ];
 
   const txManager = new TransactionsManager(client, undefined, "only-simulate");
   const statuses = await txManager.clientSend(transactionItems);