@haven-fi/solauto-sdk 1.0.9 → 1.0.11

package/dist/utils/solanaUtils.js

@@ -10,16 +10,15 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const accountUtils_1 = require("./accountUtils");
-const solautoConstants_1 = require("../constants/solautoConstants");
 const generalUtils_1 = require("./generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
-async function currentUnixSecondsSolana() {
+async function currentUnixSecondsSolana(umi) {
     return await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const blockTime = await solautoConstants_1.CONNECTION.getBlockTime(await solautoConstants_1.CONNECTION.getSlot());
+        const blockTime = await umi.rpc.getBlockTime(await umi.rpc.getSlot());
         if (blockTime === null) {
             throw new Error("Unable to retrieve block time");
         }
-        return blockTime;
+        return Number(blockTime);
     });
 }
 exports.currentUnixSecondsSolana = currentUnixSecondsSolana;
@@ -63,8 +62,8 @@ function splTokenTransferUmiIx(signer, fromTa, toTa, authority, amount) {
     return getWrappedInstruction(signer, (0, spl_token_1.createTransferInstruction)(fromTa, toTa, authority, amount));
 }
 exports.splTokenTransferUmiIx = splTokenTransferUmiIx;
-async function getAdressLookupInputs(lookupTableAddresses) {
-    const addressLookupTableAccountInfos = await solautoConstants_1.UMI.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)));
+async function getAdressLookupInputs(umi, lookupTableAddresses) {
+    const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)));
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
         const addressLookupTableAddress = lookupTableAddresses[index];
         if (accountInfo.exists) {
@@ -119,8 +118,8 @@ function assembleFinalTransaction(signer, tx, computeUnitPrice, computeUnitLimit
     return tx;
 }
 exports.assembleFinalTransaction = assembleFinalTransaction;
-async function simulateTransaction(transaction) {
-    const simulationResult = await solautoConstants_1.CONNECTION.simulateTransaction(transaction, {
+async function simulateTransaction(connection, transaction) {
+    const simulationResult = await connection.simulateTransaction(transaction, {
         sigVerify: true,
     });
     if (simulationResult.value.err) {
@@ -131,10 +130,10 @@ async function simulateTransaction(transaction) {
     }
     return simulationResult;
 }
-async function getComputeUnitPriceEstimate(tx, attemptNum) {
-    const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(solautoConstants_1.UMI, { commitment: "finalized" })).build(solautoConstants_1.UMI));
+async function getComputeUnitPriceEstimate(umi, tx, attemptNum) {
+    const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
     const serializedTransaction = bs58_1.default.encode(web3Transaction.serialize());
-    const resp = await solautoConstants_1.UMI.rpc.call("getPriorityFeeEstimate", [
+    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
         {
             transaction: serializedTransaction,
             options: { priorityLevel: attemptNum && attemptNum > 0 ? "VeryHigh" : "High" },
@@ -144,24 +143,24 @@ async function getComputeUnitPriceEstimate(tx, attemptNum) {
     return feeEstimate;
 }
 exports.getComputeUnitPriceEstimate = getComputeUnitPriceEstimate;
-async function sendSingleOptimizedTransaction(client, tx, simulateOnly, attemptNum) {
-    client.log("Sending single optimized transaction...");
-    client.log("Instructions: ", tx.getInstructions().length);
-    client.log("Serialized transaction size: ", tx.getTransactionSize(solautoConstants_1.UMI));
-    const feeEstimate = await getComputeUnitPriceEstimate(tx, attemptNum);
-    client.log("Compute unit price: ", feeEstimate);
-    const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction((0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(client.signer, tx, feeEstimate, 1400000).setLatestBlockhash(solautoConstants_1.UMI)).buildAndSign(solautoConstants_1.UMI))));
+async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly, attemptNum) {
+    console.log("Sending single optimized transaction...");
+    console.log("Instructions: ", tx.getInstructions().length);
+    console.log("Serialized transaction size: ", tx.getTransactionSize(umi));
+    const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, attemptNum);
+    console.log("Compute unit price: ", feeEstimate);
+    const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).buildAndSign(umi))));
     const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
-    client.log("Compute unit limit: ", computeUnitLimit);
+    console.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
-        const result = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await assembleFinalTransaction(client.signer, tx, feeEstimate, computeUnitLimit).sendAndConfirm(solautoConstants_1.UMI, {
+        const result = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await assembleFinalTransaction(umi.identity, tx, feeEstimate, computeUnitLimit).sendAndConfirm(umi, {
             send: {
                 skipPreflight: true,
                 commitment: "finalized",
             },
             confirm: { commitment: "finalized" },
         }));
-        client.log(`https://solscan.io/tx/${bs58_1.default.encode(result.signature)}`);
+        console.log(`https://solscan.io/tx/${bs58_1.default.encode(result.signature)}`);
         if (result.result.value.err !== null) {
             throw new Error(result.result.value.err.toString());
         }

package/dist/utils/solauto/generalUtils.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from "@metaplex-foundation/umi";
+import { PublicKey, Umi } from "@metaplex-foundation/umi";
 import { AutomationSettings, DCASettings, DCASettingsInpArgs, FeeType, LendingPlatform, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
 export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings): boolean;
@@ -14,13 +14,13 @@ export declare function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number)
 export declare function maxRepayTo(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function eligibileForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings): boolean;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters): boolean;
-export declare function getSolautoManagedPositions(authority?: PublicKey): Promise<{
+export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<{
     authority: PublicKey;
     positionId: number;
     lendingPlatform: LendingPlatform;
 }[]>;
-export declare function getAllReferralStates(): Promise<PublicKey[]>;
-export declare function getReferralsByUser(user: PublicKey): Promise<PublicKey[]>;
+export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;
+export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
 type PositionAdjustment = {
     type: "supply";
     value: bigint;

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AAwBzB,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAgB3B;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAYA;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAEtE;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAEpE;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GACvB,OAAO,CA+BT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAMT;AAED,wBAAsB,0BAA0B,CAC9C,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACR;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,EAAE,CACJ,CAkDA;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAejE;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AAED,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAE/C,qBAAa,mBAAmB;IACvB,gBAAgB,EAAE,MAAM,CAAa;IACrC,cAAc,EAAE,MAAM,CAAa;IACnC,uBAAuB,EAAE,MAAM,CAAa;IAC5C,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAEtD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IAyD9B,KAAK;IAQL,UAAU,IAAI,OAAO;CAQtB"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AA6BzB,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAgB3B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,GACf;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAYA;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKtE;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKpE;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GACvB,OAAO,CA+BT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAST;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACR;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,EAAE,CACJ,CAkDA;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAezE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AA4DD,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAE/C,qBAAa,mBAAmB;IACvB,gBAAgB,EAAE,MAAM,CAAa;IACrC,cAAc,EAAE,MAAM,CAAa;IACnC,uBAAuB,EAAE,MAAM,CAAa;IAC5C,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAEtD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IAyD9B,KAAK;IAQL,UAAU,IAAI,OAAO;CAQtB"}

package/dist/utils/solauto/generalUtils.js

@@ -8,6 +8,8 @@ const numberUtils_1 = require("../numberUtils");
 const solautoConstants_1 = require("../../constants/solautoConstants");
 const accountUtils_1 = require("../accountUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const constants_1 = require("../../constants");
+const marginfiUtils_1 = require("../marginfiUtils");
 function newPeriodsPassed(automation, currentUnixTimestamp) {
     return Math.min(automation.targetPeriods, automation.periodsPassed +
         Math.floor((currentUnixTimestamp - Number(automation.unixStartDate)) /
@@ -95,18 +97,19 @@ function eligibleForRefresh(positionState, positionSettings) {
         return eligibleForNextAutomationPeriod(positionSettings.automation);
     }
     else {
-        return (0, generalUtils_1.currentUnixSeconds)() - Number(positionState.lastUpdated) > 60 * 60 * 24 * 7;
+        return ((0, generalUtils_1.currentUnixSeconds)() - Number(positionState.lastUpdated) >
+            60 * 60 * 24 * 7);
     }
 }
 exports.eligibleForRefresh = eligibleForRefresh;
-async function getSolautoManagedPositions(authority) {
+async function getSolautoManagedPositions(umi, authority) {
     // bump: [u8; 1]
     // position_id: [u8; 1]
     // self_managed: u8 - (1 for true, 0 for false)
     // padding: [u8; 5]
     // authority: Pubkey
     // lending_platform: u8
-    const accounts = await solautoConstants_1.UMI.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
+    const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "finalized",
         dataSlice: {
             offset: 0,
@@ -147,8 +150,8 @@ async function getSolautoManagedPositions(authority) {
     });
 }
 exports.getSolautoManagedPositions = getSolautoManagedPositions;
-async function getAllReferralStates() {
-    const accounts = await solautoConstants_1.UMI.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
+async function getAllReferralStates(umi) {
+    const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "finalized",
         dataSlice: {
             offset: 0,
@@ -163,13 +166,13 @@ async function getAllReferralStates() {
     return accounts.map((x) => x.publicKey);
 }
 exports.getAllReferralStates = getAllReferralStates;
-async function getReferralsByUser(user) {
+async function getReferralsByUser(umi, user) {
     // bump: [u8; 1],
     // padding: [u8; 7],
     // authority: Pubkey,
     // referred_by_state: Pubkey,
     const userReferralState = await (0, accountUtils_1.getReferralState)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(user));
-    const accounts = await solautoConstants_1.UMI.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
+    const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "finalized",
         dataSlice: {
             offset: 0,
@@ -190,6 +193,46 @@ async function getReferralsByUser(user) {
     return accounts.map((x) => x.publicKey);
 }
 exports.getReferralsByUser = getReferralsByUser;
+async function positionStateWithLatestPrices(umi, state, protocolAccount, lendingPlatform) {
+    if ((0, generalUtils_1.currentUnixSeconds)() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
+        if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
+            return await (0, marginfiUtils_1.getMarginfiAccountPositionState)(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(protocolAccount));
+        }
+        else {
+            throw new Error("Lending platorm not yet supported");
+        }
+    }
+    const [supplyPrice, debtPrice] = await (0, generalUtils_1.getTokenPrices)([
+        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint),
+        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint),
+    ]);
+    const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseUnit, state.supply.decimals) *
+        supplyPrice;
+    const debtUsd = (0, numberUtils_1.fromBaseUnit)(state.debt.amountUsed.baseUnit, state.debt.decimals) *
+        debtPrice;
+    return {
+        ...state,
+        liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, state.liqThresholdBps),
+        netWorth: {
+            ...state.netWorth,
+            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
+        },
+        supply: {
+            ...state.supply,
+            amountUsed: {
+                ...state.supply.amountUsed,
+                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
+            },
+        },
+        debt: {
+            ...state.debt,
+            amountUsed: {
+                ...state.debt.amountUsed,
+                baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
+            },
+        },
+    };
+}
 class LivePositionUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);

package/package.json

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

package/src/clients/solautoClient.ts

@@ -1,5 +1,9 @@
 import "rpc-websockets/dist/lib/client";
-import { AddressLookupTableProgram, PublicKey } from "@solana/web3.js";
+import {
+  AddressLookupTableProgram,
+  Connection,
+  PublicKey,
+} from "@solana/web3.js";
 import {
   Signer,
   TransactionBuilder,
@@ -13,7 +17,10 @@ import {
   some,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { WalletAdapter, walletAdapterIdentity } from "@metaplex-foundation/umi-signer-wallet-adapters";
+import {
+  WalletAdapter,
+  walletAdapterIdentity,
+} from "@metaplex-foundation/umi-signer-wallet-adapters";
 import {
   DCASettings,
   DCASettingsInpArgs,
@@ -29,6 +36,7 @@ import {
   cancelDCA,
   claimReferralFees,
   closePosition,
+  createSolautoProgram,
   safeFetchReferralState,
   safeFetchSolautoPosition,
   updatePosition,
@@ -39,10 +47,7 @@ import {
   getSolautoPositionAccount,
   getTokenAccount,
 } from "../utils/accountUtils";
-import {
-  SOLAUTO_FEES_WALLET,
-  USD_DECIMALS,
-} from "../constants/generalAccounts";
+import { SOLAUTO_FEES_WALLET } from "../constants/generalAccounts";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import {
   getWrappedInstruction,
@@ -50,18 +55,10 @@ import {
 } from "../utils/solanaUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
-import {
-  CONNECTION,
-  MIN_POSITION_STATE_FRESHNESS_SECS,
-  UMI,
-} from "../constants/solautoConstants";
-import { currentUnixSeconds, getTokenPrices } from "../utils/generalUtils";
+import { MIN_POSITION_STATE_FRESHNESS_SECS } from "../constants/solautoConstants";
+import { currentUnixSeconds } from "../utils/generalUtils";
 import { LivePositionUpdates } from "../utils/solauto/generalUtils";
-import {
-  fromBaseUnit,
-  getLiqUtilzationRateBps,
-  toBaseUnit,
-} from "../utils/numberUtils";
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 
 export interface SolautoClientArgs {
   authority?: PublicKey;
@@ -77,9 +74,8 @@ export interface SolautoClientArgs {
 }
 
 export abstract class SolautoClient {
-  public localTest: boolean;
-
   public umi!: Umi;
+  public connection!: Connection;
   public lendingPlatform!: LendingPlatform;
 
   public authority!: PublicKey;
@@ -116,19 +112,37 @@ export abstract class SolautoClient {
 
   public livePositionUpdates: LivePositionUpdates = new LivePositionUpdates();
 
-  constructor(localTest?: boolean) {
-    this.localTest = Boolean(localTest);
+  constructor(
+    private heliusApiKey: string,
+    public localTest?: boolean
+  ) {
+    this.connection = new Connection(
+      `https://mainnet.helius-rpc.com/?api-key=${this.heliusApiKey}`,
+      "finalized"
+    );
+    this.umi = createUmi(this.connection).use({
+      install(umi) {
+        umi.programs.add(createSolautoProgram(), false);
+      },
+    });
   }
 
-  async initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform) {
-    this.umi = UMI;
+  async initialize(
+    args: SolautoClientArgs,
+    lendingPlatform: LendingPlatform,
+  ) {
     if (!args.signer && !args.wallet) {
       throw new Error("Signer or wallet must be provided");
     }
-    this.umi = UMI.use(args.signer ? signerIdentity(args.signer) : walletAdapterIdentity(args.wallet!, true));
-    
+    this.umi = this.umi.use(
+      args.signer
+        ? signerIdentity(args.signer)
+        : walletAdapterIdentity(args.wallet!, true)
+    );
+
     this.signer = this.umi.identity;
-    this.authority = args.authority ?? toWeb3JsPublicKey(this.umi.identity.publicKey);
+    this.authority =
+      args.authority ?? toWeb3JsPublicKey(this.umi.identity.publicKey);
 
     this.positionId = args.positionId;
     this.selfManaged = this.positionId === 0;
@@ -282,7 +296,7 @@ export abstract class SolautoClient {
 
   async fetchExistingAuthorityLutAccounts(): Promise<PublicKey[]> {
     const lookupTable = this.authorityLutAddress
-      ? await CONNECTION.getAddressLookupTable(this.authorityLutAddress)
+      ? await this.connection.getAddressLookupTable(this.authorityLutAddress)
       : null;
     if (lookupTable === null) {
       this.authorityLutAddress = undefined;
@@ -312,7 +326,7 @@ export abstract class SolautoClient {
         AddressLookupTableProgram.createLookupTable({
           authority: this.authority,
           payer: toWeb3JsPublicKey(this.signer.publicKey),
-          recentSlot: await CONNECTION.getSlot({ commitment: "finalized" }),
+          recentSlot: await this.umi.rpc.getSlot({ commitment: "finalized" }),
         });
       this.authorityLutAddress = lookupTableAddress;
       tx = tx.add(getWrappedInstruction(this.signer, createLookupTableInst));
@@ -626,55 +640,6 @@ export abstract class SolautoClient {
     limitGapBps?: number
   ): TransactionBuilder;
 
-  async positionStateWithLatestPrices(): Promise<PositionState | undefined> {
-    if (!this.solautoPositionData) {
-      return undefined;
-    }
-
-    const state = this.solautoPositionState ?? this.solautoPositionData.state;
-    if (currentUnixSeconds() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
-      return this.getFreshPositionState();
-    }
-
-    const [supplyPrice, debtPrice] = await getTokenPrices([
-      toWeb3JsPublicKey(state.supply.mint),
-      toWeb3JsPublicKey(state.debt.mint),
-    ]);
-
-    const supplyUsd =
-      fromBaseUnit(state.supply.amountUsed.baseUnit, state.supply.decimals) *
-      supplyPrice;
-    const debtUsd =
-      fromBaseUnit(state.debt.amountUsed.baseUnit, state.debt.decimals) *
-      debtPrice;
-    return {
-      ...state,
-      liqUtilizationRateBps: getLiqUtilzationRateBps(
-        supplyUsd,
-        debtUsd,
-        state.liqThresholdBps
-      ),
-      netWorth: {
-        ...state.netWorth,
-        baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
-      },
-      supply: {
-        ...state.supply,
-        amountUsed: {
-          ...state.supply.amountUsed,
-          baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
-        },
-      },
-      debt: {
-        ...state.debt,
-        amountUsed: {
-          ...state.debt.amountUsed,
-          baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
-        },
-      },
-    };
-  }
-
   async getFreshPositionState(): Promise<PositionState | undefined> {
     if (
       Boolean(this.solautoPositionState) &&

package/src/clients/solautoMarginfiClient.ts

@@ -135,6 +135,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     })!;
 
     const existingMarginfiAccounts = await getAllMarginfiAccountsByAuthority(
+      this.umi,
       toWeb3JsPublicKey(this.signer.publicKey)
     );
     const emptyMarginfiAccounts = existingMarginfiAccounts.filter(
@@ -481,15 +482,11 @@ export class SolautoMarginfiClient extends SolautoClient {
       return state;
     }
 
-    const marginfiAccount = await safeFetchMarginfiAccount(
-      this.umi,
-      publicKey(this.marginfiAccountPk)
-    );
-
     const freshState = await getMarginfiAccountPositionState(
+      this.umi,
       this.supplyLiquidityMint,
       this.debtLiquidityMint,
-      marginfiAccount,
+      this.marginfiAccountPk,
       this.livePositionUpdates
     );
     this.log(freshState);

package/src/constants/solautoConstants.ts

@@ -12,7 +12,7 @@ import {
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 // import { JitoRpcConnection } from "jito-ts";
-import { createSolautoProgram, SOLAUTO_PROGRAM_ID } from "../generated";
+import { SOLAUTO_PROGRAM_ID } from "../generated";
 import { SOLAUTO_MANAGER } from "./generalAccounts";
 
 export const DEFAULT_RISK_AVERSION_BPS = 1500;
@@ -20,21 +20,11 @@ export const DEFAULT_LIMIT_GAP_BPS = 1000;
 export const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 export const MAX_REPAY_GAP_BPS = 100;
 
-export const CONNECTION = new Connection(
-  `https://mainnet.helius-rpc.com/?api-key=${process.env.HELIUS_API_KEY}`,
-  "finalized"
-);
-
 // export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
 // export const JITO_CONNECTION = new JitoRpcConnection(
 //   `https://${JITO_BLOCK_ENGINE}`,
 //   "finalized"
 // );
-export const UMI = createUmi(CONNECTION).use({
-  install(umi) {
-    umi.programs.add(createSolautoProgram(), false);
-  },
-});
 
 export const PRICES: { [key: string]: { price: number; time: number; } } = {};
 

package/src/transactions/transactionUtils.ts

@@ -1,6 +1,7 @@
 import {
   Signer,
   TransactionBuilder,
+  Umi,
   publicKey,
   transactionBuilder,
 } from "@metaplex-foundation/umi";
@@ -39,7 +40,6 @@ import {
   rpcAccountCreated,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
-import { UMI } from "../constants/solautoConstants";
 import { uint8ArrayToBigInt } from "../utils/numberUtils";
 import {
   eligibileForRebalance,
@@ -121,7 +121,7 @@ async function transactionChoresBefore(
     undefined
   );
   if (wSolUsage !== undefined) {
-    if (!getSolanaAccountCreated(wSolUsage.wSolTokenAccount)) {
+    if (!getSolanaAccountCreated(client.umi, wSolUsage.wSolTokenAccount)) {
       client.log(`Closing signer wSol TA`);
       chores = chores.add(
         closeTokenAccountUmiIx(
@@ -150,7 +150,7 @@ async function transactionChoresBefore(
     if (amountToTransfer > 0) {
       const amount =
         amountToTransfer +
-        (await UMI.rpc.getRent(TOKEN_ACCOUNT_SIZE)).basisPoints;
+        (await client.umi.rpc.getRent(TOKEN_ACCOUNT_SIZE)).basisPoints;
       client.log(`Transferring ${amount} lamports to signer wSol TA`);
       chores = chores.add(
         systemTransferUmiIx(client.signer, wSolUsage.wSolTokenAccount, amount)
@@ -183,7 +183,7 @@ async function transactionChoresBefore(
       continue;
     }
 
-    if (!getSolanaAccountCreated(tokenAccount)) {
+    if (!getSolanaAccountCreated(client.umi, tokenAccount)) {
       chores = chores.add(
         createAssociatedTokenAccountUmiIx(
           client.signer,
@@ -229,7 +229,7 @@ export async function rebalanceChoresBefore(
   ];
 
   const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount] =
-    await UMI.rpc.getAccounts(
+    await client.umi.rpc.getAccounts(
       accountsNeeded.map((x) => publicKey(x ?? PublicKey.default))
     );
 
@@ -482,12 +482,12 @@ export async function buildSolautoRebalanceTransaction(
 }
 
 export async function convertReferralFeesToDestination(
+  umi: Umi,
   referralState: ReferralState,
   tokenAccount: SplTokenAccount,
-  signer: Signer
 ): Promise<[TransactionBuilder, string[]]> {
   const { lookupTableAddresses, setupInstructions, swapIx } =
-    await getJupSwapTransaction(signer, {
+    await getJupSwapTransaction(umi.identity, {
       amount: tokenAccount.amount,
       destinationWallet: toWeb3JsPublicKey(referralState.publicKey),
       inputMint: tokenAccount.mint,
@@ -499,12 +499,12 @@ export async function convertReferralFeesToDestination(
   let tx = transactionBuilder()
     .add(setupInstructions)
     .add(
-      convertReferralFees(UMI, {
-        signer,
+      convertReferralFees(umi, {
+        signer: umi.identity,
         intermediaryTa: publicKey(
           getTokenAccount(
-            toWeb3JsPublicKey(signer.publicKey),
-            toWeb3JsPublicKey(referralState.destFeesMint)
+            toWeb3JsPublicKey(umi.identity.publicKey),
+            tokenAccount.mint
           )
         ),
         ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),

package/src/transactions/transactionsManager.ts

@@ -9,7 +9,6 @@ import {
   getAdressLookupInputs,
   sendSingleOptimizedTransaction,
 } from "../utils/solanaUtils";
-import { UMI } from "../constants/solautoConstants";
 import { retryWithExponentialBackoff } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
@@ -35,7 +34,10 @@ class LookupTables {
       (x) => !currentCacheAddresses.includes(x)
     );
     if (missingAddresses) {
-      const additionalInputs = await getAdressLookupInputs(missingAddresses);
+      const additionalInputs = await getAdressLookupInputs(
+        this.client.umi,
+        missingAddresses
+      );
       this.cache.push(...additionalInputs);
     }
 
@@ -110,7 +112,7 @@ class TransactionSet {
           ...item.lookupTableAddresses,
         ])
       )
-      .fitsInOneTransaction(UMI);
+      .fitsInOneTransaction(this.client.umi);
   }
 
   add(...items: TransactionItem[]) {
@@ -202,9 +204,9 @@ export class TransactionsManager {
       const transaction = item.tx.setAddressLookupTables(
         await this.lookupTables.getLutInputs(item.lookupTableAddresses)
       );
-      if (!transaction.fitsInOneTransaction(UMI)) {
+      if (!transaction.fitsInOneTransaction(this.client.umi)) {
         throw new Error(
-          `Transaction exceeds max transaction size (${transaction.getTransactionSize(UMI)})`
+          `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
         );
       } else {
         let newSet = new TransactionSet(this.client, this.lookupTables, [item]);
@@ -246,7 +248,8 @@ export class TransactionsManager {
       await retryWithExponentialBackoff(
         async (attemptNum) =>
           await sendSingleOptimizedTransaction(
-            this.client,
+            this.client.umi,
+            this.client.connection,
             updateLookupTable.updateLutTx,
             this.simulateOnly,
             attemptNum
@@ -353,7 +356,8 @@ export class TransactionsManager {
           } else {
             this.updateStatus(itemSet.name(), TransactionStatus.Processing);
             const txSig = await sendSingleOptimizedTransaction(
-              this.client,
+              this.client.umi,
+              this.client.connection,
               tx,
               this.simulateOnly,
               attemptNum

package/src/utils/generalUtils.ts

@@ -1,8 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, publicKey } from "@metaplex-foundation/umi";
+import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
-import { PRICES, UMI } from "../constants/solautoConstants";
+import { PRICES } from "../constants/solautoConstants";
 
 export function generateRandomU8(): number {
   return Math.floor(Math.random() * 255 + 1);
@@ -21,8 +21,8 @@ export function currentUnixSeconds(): number {
   return Math.round(new Date().getTime() / 1000);
 }
 
-export async function getSolanaAccountCreated(pk: PublicKey): Promise<boolean> {
-  const account = await UMI.rpc.getAccount(publicKey(pk));
+export async function getSolanaAccountCreated(umi: Umi, pk: PublicKey): Promise<boolean> {
+  const account = await umi.rpc.getAccount(publicKey(pk));
   return rpcAccountCreated(account);
 }
 
@@ -44,7 +44,7 @@ export function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean {
 
 export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
-  if (!mints.some(mint => !(mint.toString() in PRICES) || currentTime - PRICES[mint.toString()].time > 3)) {
+  if (!mints.some(mint => !(mint.toString() in PRICES) || currentTime - PRICES[mint.toString()].time > 5)) {
     console.log("Accessing price cache");
     return mints.map(mint => PRICES[mint.toString()].price);
   }