@haven-fi/solauto-sdk 1.0.684 → 1.0.686

package/src/utils/instructionUtils.ts

@@ -82,7 +82,8 @@ export function borrow(client: SolautoClient, baseUnitAmount: bigint) {
         fields: [baseUnitAmount],
       }),
     }),
-    "borrow"
+    "borrow",
+    true
   );
 }
 
@@ -98,7 +99,8 @@ export function withdraw(client: SolautoClient, amount: "All" | bigint) {
         ],
       }),
     }),
-    "withdraw"
+    "withdraw",
+    true
   );
 }
 
@@ -129,7 +131,8 @@ export function rebalance(
         targetLiqUtilizationRateBps,
         attemptNum > 2 && prevError instanceof TransactionTooLargeError
       ).buildRebalanceTx(attemptNum),
-    "rebalance"
+    "rebalance",
+    true
   );
 }
 

package/src/utils/switchboardUtils.ts

@@ -8,10 +8,14 @@ import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
+import Big from "big.js";
 import switchboardIdl from "../idls/switchboard.json";
-import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
+import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
 import { TransactionItemInputs } from "../types";
-import { retryWithExponentialBackoff } from "./generalUtils";
+import {
+  currentUnixSeconds,
+  retryWithExponentialBackoff,
+} from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
 
 export function getPullFeed(
@@ -62,6 +66,13 @@ export async function buildSwbSubmitResponseTx(
     throw new Error("Unable to fetch SWB crank IX");
   }
 
+  const price = (responses[0].value as Big).toNumber();
+  PRICES[mint.toString()] = {
+    realtimePrice: price,
+    emaPrice: price,
+    time: currentUnixSeconds(),
+  };
+
   return {
     tx: transactionBuilder([getWrappedInstruction(signer, pullIx!)]),
     lookupTableAddresses: responses
@@ -97,3 +108,7 @@ export async function getSwitchboardFeedData(
 
   return results;
 }
+
+export function isSwitchboardMint(mint: PublicKey | string) {
+  return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
+}

package/tests/transactions/shared.ts

@@ -13,7 +13,6 @@ import {
   SOLAUTO_TEST_PROGRAM,
   SolautoSettingsParametersInpArgs,
   toBaseUnit,
-  TransactionsManager,
   USDC,
   deposit,
   openSolautoPosition,
@@ -22,6 +21,7 @@ import {
   withdraw,
   closeSolautoPosition,
   getMarginfiAccounts,
+  ClientTransactionsManager,
 } from "../../src";
 
 export async function e2eTransactionTest(
@@ -41,7 +41,7 @@ export async function e2eTransactionTest(
   const supplyMint = new PublicKey(NATIVE_MINT);
   const debtMint = new PublicKey(USDC);
 
-  await client.initialize({
+  await client.initializeNewSolautoPosition({
     positionId: 1,
     lpPoolAccount: getMarginfiAccounts().defaultGroup,
     supplyMint,
@@ -79,8 +79,11 @@ export async function e2eTransactionTest(
     closeSolautoPosition(client),
   ];
 
-  const txManager = new TransactionsManager(client, undefined, "only-simulate");
-  const statuses = await txManager.clientSend(transactionItems);
+  const txManager = new ClientTransactionsManager({
+    txHandler: client,
+    txRunType: "only-simulate",
+  });
+  const statuses = await txManager.send(transactionItems);
 
   consoleLog(statuses);
 }

package/dist/services/transactions/transactionsManager.d.ts

@@ -1,68 +0,0 @@
-import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../../types";
-import { ErrorsToThrow } from "../../utils";
-import { SolautoClient, ReferralStateManager } from "../solauto";
-export declare class TransactionTooLargeError extends Error {
-    constructor(message: string);
-}
-export declare class TransactionItem {
-    fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>;
-    name?: string | undefined;
-    lookupTableAddresses: string[];
-    tx?: TransactionBuilder;
-    initialized: boolean;
-    orderPrio: number;
-    constructor(fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>, name?: string | undefined);
-    initialize(): Promise<void>;
-    refetch(attemptNum: number, prevError?: Error): Promise<void>;
-    uniqueAccounts(): string[];
-}
-export declare enum TransactionStatus {
-    Skipped = "Skipped",
-    Processing = "Processing",
-    Queued = "Queued",
-    Successful = "Successful",
-    Failed = "Failed"
-}
-export type TransactionManagerStatuses = {
-    name: string;
-    attemptNum: number;
-    status: TransactionStatus;
-    moreInfo?: string;
-    simulationSuccessful?: boolean;
-    txSig?: string;
-}[];
-interface RetryConfig {
-    signableRetries?: number;
-    totalRetries?: number;
-    retryDelay?: number;
-}
-export declare class TransactionsManager {
-    private txHandler;
-    private statusCallback?;
-    private txType?;
-    private priorityFeeSetting;
-    private atomically;
-    private errorsToThrow?;
-    private statuses;
-    private lookupTables;
-    private signableRetries;
-    private totalRetries;
-    private retryDelay;
-    updateOracleTxName: string;
-    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, priorityFeeSetting?: PriorityFeeSetting, atomically?: boolean, errorsToThrow?: ErrorsToThrow | undefined, retryConfig?: RetryConfig);
-    private assembleTransactionSets;
-    private updateStatus;
-    private debugAccounts;
-    private getUpdatedPriorityFeeSetting;
-    private updateStatusForSets;
-    private updateLut;
-    clientSend(transactions: TransactionItem[]): Promise<TransactionManagerStatuses>;
-    send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
-    private processTransactionsAtomically;
-    private processTransactionSet;
-    private refreshItemSets;
-    private sendTransaction;
-}
-export {};
-//# sourceMappingURL=transactionsManager.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IAVtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK;IAOnD,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAyGzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;YA2Df,eAAe;CA6D9B"}