@haven-fi/solauto-sdk 1.0.554 → 1.0.556

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":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LivePositionUpdates = void 0;
+exports.ContextUpdates = void 0;
 exports.createDynamicSolautoProgram = createDynamicSolautoProgram;
 exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
@@ -401,7 +401,7 @@ function createSolautoSettings(settings) {
         padding1: [],
     };
 }
-class LivePositionUpdates {
+class ContextUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);
         this.debtAdjustment = BigInt(0);
@@ -456,7 +456,7 @@ class LivePositionUpdates {
         this.cancellingDca = undefined;
         this.jupSwap = undefined;
     }
-    hasUpdates() {
+    positionUpdates() {
         return (this.supplyAdjustment !== BigInt(0) ||
             this.debtAdjustment !== BigInt(0) ||
             this.dcaInBalance !== undefined ||
@@ -464,4 +464,4 @@ class LivePositionUpdates {
             this.cancellingDca !== undefined);
     }
 }
-exports.LivePositionUpdates = LivePositionUpdates;
+exports.ContextUpdates = ContextUpdates;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.554",
+  "version": "1.0.556",
   "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

@@ -46,7 +46,7 @@ import {
   SOLAUTO_LUT,
 } from "../constants/solautoConstants";
 import { currentUnixSeconds } from "../utils/generalUtils";
-import { LivePositionUpdates } from "../utils/solauto/generalUtils";
+import { ContextUpdates } from "../utils/solauto/generalUtils";
 import {
   ReferralStateManager,
   ReferralStateManagerArgs,
@@ -87,7 +87,7 @@ export abstract class SolautoClient extends ReferralStateManager {
 
   public authorityLutAddress?: PublicKey;
 
-  public livePositionUpdates: LivePositionUpdates = new LivePositionUpdates();
+  public contextUpdates: ContextUpdates = new ContextUpdates();
 
   private signerSupplyBalance: bigint | undefined;
   private signerDebtBalance: bigint | undefined;
@@ -193,18 +193,18 @@ export abstract class SolautoClient extends ReferralStateManager {
           { commitment: "confirmed" }
         );
       } else {
-        if (this.livePositionUpdates.activeDca) {
+        if (this.contextUpdates.activeDca) {
           this.solautoPositionData.position.dca =
-            this.livePositionUpdates.activeDca;
+            this.contextUpdates.activeDca;
         }
-        if (this.livePositionUpdates.settings) {
+        if (this.contextUpdates.settings) {
           this.solautoPositionData.position.settingParams =
-            this.livePositionUpdates.settings;
+            this.contextUpdates.settings;
         }
-        // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form livePositionUpdates
+        // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
       }
     }
-    this.livePositionUpdates.reset();
+    this.contextUpdates.reset();
   }
 
   abstract protocolAccount(): PublicKey;
@@ -357,14 +357,14 @@ export abstract class SolautoClient extends ReferralStateManager {
 
   solautoPositionSettings(): SolautoSettingsParameters | undefined {
     return (
-      this.livePositionUpdates.settings ??
+      this.contextUpdates.settings ??
       this.solautoPositionData?.position.settingParams
     );
   }
 
   solautoPositionActiveDca(): DCASettings | undefined {
     return (
-      this.livePositionUpdates.activeDca ??
+      this.contextUpdates.activeDca ??
       this.solautoPositionData?.position.dca
     );
   }
@@ -381,7 +381,7 @@ export abstract class SolautoClient extends ReferralStateManager {
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
     if (dca && dca.dcaInBaseUnit > 0) {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "dcaInBalance",
         value: {
           amount: BigInt(dca.dcaInBaseUnit),
@@ -390,13 +390,13 @@ export abstract class SolautoClient extends ReferralStateManager {
       });
     }
     if (settingParams) {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "settings",
         value: settingParams,
       });
     }
     if (dca) {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "dca",
         value: dca,
       });
@@ -425,7 +425,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         isSome(args.dca) &&
         args.dca.value.dcaInBaseUnit > 0
       ) {
-        this.livePositionUpdates.new({
+        this.contextUpdates.new({
           type: "dcaInBalance",
           value: {
             amount: BigInt(args.dca.value.dcaInBaseUnit),
@@ -436,14 +436,14 @@ export abstract class SolautoClient extends ReferralStateManager {
     }
 
     if (isOption(args.settingParams) && isSome(args.settingParams)) {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "settings",
         value: args.settingParams.value,
       });
     }
 
     if (isOption(args.dca) && isSome(args.dca)) {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "dca",
         value: args.dca.value,
       });
@@ -488,7 +488,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         signerDcaTa = publicKey(this.signerDebtTa);
       }
 
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "cancellingDca",
         value: this.solautoPositionData!.position.dca.tokenType,
       });
@@ -550,18 +550,18 @@ export abstract class SolautoClient extends ReferralStateManager {
     }
 
     if (args.__kind === "Deposit") {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "supply",
         value: BigInt(args.fields[0]),
       });
     } else if (args.__kind === "Withdraw") {
       if (args.fields[0].__kind === "Some") {
-        this.livePositionUpdates.new({
+        this.contextUpdates.new({
           type: "supply",
           value: BigInt(args.fields[0].fields[0]) * BigInt(-1),
         });
       } else {
-        this.livePositionUpdates.new({
+        this.contextUpdates.new({
           type: "supply",
           value:
             (this.solautoPositionState?.supply.amountUsed.baseUnit ??
@@ -569,18 +569,18 @@ export abstract class SolautoClient extends ReferralStateManager {
         });
       }
     } else if (args.__kind === "Borrow") {
-      this.livePositionUpdates.new({
+      this.contextUpdates.new({
         type: "debt",
         value: BigInt(args.fields[0]),
       });
     } else {
       if (args.fields[0].__kind === "Some") {
-        this.livePositionUpdates.new({
+        this.contextUpdates.new({
           type: "debt",
           value: BigInt(args.fields[0].fields[0]) * BigInt(-1),
         });
       } else {
-        this.livePositionUpdates.new({
+        this.contextUpdates.new({
           type: "debt",
           value:
             (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) *
@@ -615,7 +615,7 @@ export abstract class SolautoClient extends ReferralStateManager {
       Boolean(this.solautoPositionState) &&
       Number(this.solautoPositionState!.lastUpdated) >
         currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
-      !this.livePositionUpdates.hasUpdates()
+      !this.contextUpdates.positionUpdates()
     ) {
       return this.solautoPositionState;
     }

package/src/clients/solautoMarginfiClient.ts

@@ -726,7 +726,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       this.marginfiGroup,
       useDesignatedMint ? { mint: this.supplyMint } : undefined,
       useDesignatedMint ? { mint: this.debtMint } : undefined,
-      this.livePositionUpdates
+      this.contextUpdates
     );
 
     if (resp) {

package/src/constants/solautoConstants.ts

@@ -44,10 +44,6 @@ export const JITO_TIP_ACCOUNTS = [
   "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
 ];
 
-// "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
-// "J97FEQeJzChRnaAjNy3dRvm9FBavKqAdxo8jKXzw17ut"
-// "ByhmNseaYZXBDcBm6xhbgarwixgjym6H4ddLsvgoL3BL"
-// "2VJK8AHqtiaiJKYbBtFr3EHV4Hcy1FHCiEYQFmUvxot8"
 export const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export const STANDARD_LUT_ACCOUNTS = [
   PublicKey.default,

package/src/transactions/transactionUtils.ts

@@ -583,7 +583,7 @@ export async function getTransactionChores(
       client,
       accountsGettingCreated,
       solautoActions,
-      client.livePositionUpdates.dcaInBalance
+      client.contextUpdates.dcaInBalance
     ),
     await rebalanceChoresBefore(client, tx, accountsGettingCreated),
   ]);
@@ -592,7 +592,7 @@ export async function getTransactionChores(
     transactionChoresAfter(
       client,
       solautoActions,
-      client.livePositionUpdates.cancellingDca
+      client.contextUpdates.cancellingDca
     )
   );
 
@@ -620,8 +620,8 @@ export async function requiresRefreshBeforeRebalance(
     return true;
   } else if (client.solautoPositionData && !client.selfManaged) {
     if (
-      client.livePositionUpdates.supplyAdjustment > BigInt(0) ||
-      client.livePositionUpdates.debtAdjustment > BigInt(0)
+      client.contextUpdates.supplyAdjustment > BigInt(0) ||
+      client.contextUpdates.debtAdjustment > BigInt(0)
     ) {
       return false;
     }
@@ -638,8 +638,8 @@ export async function requiresRefreshBeforeRebalance(
 
     client.log("Liq utilization rate diff:", utilizationRateDiff);
     if (
-      client.livePositionUpdates.supplyAdjustment === BigInt(0) &&
-      client.livePositionUpdates.debtAdjustment === BigInt(0) &&
+      client.contextUpdates.supplyAdjustment === BigInt(0) &&
+      client.contextUpdates.debtAdjustment === BigInt(0) &&
       utilizationRateDiff >= 10
     ) {
       client.log(
@@ -667,7 +667,7 @@ export async function buildSolautoRebalanceTransaction(
 
   if (
     (client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
-      client.livePositionUpdates.supplyAdjustment === BigInt(0)) ||
+      client.contextUpdates.supplyAdjustment === BigInt(0)) ||
     (targetLiqUtilizationRateBps === undefined &&
       !eligibleForRebalance(
         client.solautoPositionState!,

package/src/utils/generalUtils.ts

@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { TOKEN_INFO, TokenInfo } from "../constants";
+import axios from "axios";
 
 export function consoleLog(...args: any[]): void {
   if ((globalThis as any).LOCAL_TEST) {
@@ -142,3 +143,28 @@ export function toEnumValue<E extends object>(
 
   return undefined;
 }
+
+export async function customRpcCall(umi: Umi, method: string, params?: any) {
+  const data = (
+    await axios.post(
+      umi.rpc.getEndpoint(),
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method,
+        params,
+      },
+      {
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    )
+  ).data;
+
+  if ("result" in data) {
+    return data.result;
+  } else {
+    return data;
+  }
+}

package/src/utils/jitoUtils.ts

@@ -25,7 +25,11 @@ import {
   sendSingleOptimizedTransaction,
   systemTransferUmiIx,
 } from "./solanaUtils";
-import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
+import {
+  consoleLog,
+  customRpcCall,
+  retryWithExponentialBackoff,
+} from "./generalUtils";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
@@ -74,35 +78,47 @@ function parseJitoErrorMessage(message: string) {
 
 async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
   const simulationResult = await retryWithExponentialBackoff(async () => {
-    const resp = await axios.post(
-      umi.rpc.getEndpoint(),
+    const res = await customRpcCall(umi, "simulateBundle", [
       {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "simulateBundle",
-        params: [
-          {
-            encodedTransactions: txs.map((x) =>
-              Buffer.from(x.serialize()).toString("base64")
-            ),
-          },
-          {
-            encoding: "base64",
-            commitment: "confirmed",
-            preExecutionAccountsConfigs: txs.map((_) => {}),
-            postExecutionAccountsConfigs: txs.map((_) => {}),
-            skipSigVerify: true,
-          },
-        ],
+        encodedTransactions: txs.map((x) =>
+          Buffer.from(x.serialize()).toString("base64")
+        ),
       },
       {
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    );
-
-    const res = resp.data as any;
+        encoding: "base64",
+        commitment: "confirmed",
+        preExecutionAccountsConfigs: txs.map((_) => {}),
+        postExecutionAccountsConfigs: txs.map((_) => {}),
+        skipSigVerify: true,
+      },
+    ]);
+    // const resp = await axios.post(
+    //   umi.rpc.getEndpoint(),
+    //   {
+    //     jsonrpc: "2.0",
+    //     id: 1,
+    //     method: "simulateBundle",
+    //     params: [
+    //       {
+    //         encodedTransactions: txs.map((x) =>
+    //           Buffer.from(x.serialize()).toString("base64")
+    //         ),
+    //       },
+    //       {
+    //         encoding: "base64",
+    //         commitment: "confirmed",
+    //         preExecutionAccountsConfigs: txs.map((_) => {}),
+    //         postExecutionAccountsConfigs: txs.map((_) => {}),
+    //         skipSigVerify: true,
+    //       },
+    //     ],
+    //   },
+    //   {
+    //     headers: {
+    //       "Content-Type": "application/json",
+    //     },
+    //   }
+    // );
 
     if (res.result && res.result.value && res.result.value.summary.failed) {
       const resValue = res.result.value;
@@ -191,17 +207,12 @@ async function umiToVersionedTransactions(
 }
 
 async function getBundleStatus(umi: Umi, bundleId: string) {
-  const res = await axios.post(umi.rpc.getEndpoint(), {
-    jsonrpc: "2.0",
-    id: 1,
-    method: "getBundleStatuses",
-    params: [[bundleId]],
-  });
-  if (res.data.error) {
-    throw new Error(`Failed to get bundle status: ${res.data.error}`);
+  const res = await customRpcCall(umi, "getBundleStatuses", [[bundleId]]);
+  if (res.error) {
+    throw new Error(`Failed to get bundle status: ${res.error}`);
   }
 
-  return res.data.result;
+  return res.result;
 }
 
 async function pollBundleStatus(
@@ -317,7 +328,7 @@ export async function sendJitoBundledTransactions(
   );
 
   txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
-  
+
   const feeEstimates =
     priorityFeeSetting !== PriorityFeeSetting.None
       ? await Promise.all(

package/src/utils/marginfiUtils.ts

@@ -26,7 +26,7 @@ import {
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState, PositionTokenUsage } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
-import { LivePositionUpdates } from "./solauto/generalUtils";
+import { ContextUpdates } from "./solauto/generalUtils";
 import { ALL_SUPPORTED_TOKENS, TOKEN_INFO } from "../constants";
 import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
 
@@ -296,7 +296,7 @@ export async function getMarginfiAccountPositionState(
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
-  livePositionUpdates?: LivePositionUpdates
+  contextUpdates?: ContextUpdates
 ): Promise<
   | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
   | undefined
@@ -381,7 +381,7 @@ export async function getMarginfiAccountPositionState(
         supplyBank!,
         true,
         bytesToI80F48(supplyBalances[0].assetShares.value),
-        livePositionUpdates?.supplyAdjustment
+        contextUpdates?.supplyAdjustment
       );
     }
 
@@ -398,7 +398,7 @@ export async function getMarginfiAccountPositionState(
         debtBank!,
         false,
         bytesToI80F48(debtBalances[0].liabilityShares.value),
-        livePositionUpdates?.debtAdjustment
+        contextUpdates?.debtAdjustment
       );
     }
   }
@@ -412,7 +412,7 @@ export async function getMarginfiAccountPositionState(
       supplyBank,
       true,
       0,
-      livePositionUpdates?.supplyAdjustment
+      contextUpdates?.supplyAdjustment
     );
   }
 
@@ -440,7 +440,7 @@ export async function getMarginfiAccountPositionState(
       debtBank,
       false,
       0,
-      livePositionUpdates?.debtAdjustment
+      contextUpdates?.debtAdjustment
     );
   }
 

package/src/utils/solanaUtils.ts

@@ -36,6 +36,7 @@ import { getTokenAccount } from "./accountUtils";
 import {
   arraysAreEqual,
   consoleLog,
+  customRpcCall,
   retryWithExponentialBackoff,
 } from "./generalUtils";
 import {
@@ -292,17 +293,10 @@ export async function getQnComputeUnitPriceEstimate(
   programId: PublicKey,
   blockheight: number = 50
 ): Promise<any> {
-  return (
-    await axios.post(umi.rpc.getEndpoint(), {
-      method: "qn_estimatePriorityFees",
-      jsonrpc: "2.0",
-      id: 1,
-      params: {
-        last_n_blocks: blockheight,
-        account: programId.toString(),
-      },
-    })
-  ).data;
+  return await customRpcCall(umi, "qn_estimatePriorityFees", {
+    last_n_blocks: blockheight,
+    account: programId.toString(),
+  });
 }
 
 export async function getComputeUnitPriceEstimate(
@@ -321,7 +315,7 @@ export async function getComputeUnitPriceEstimate(
 
   let feeEstimate: number | undefined;
   try {
-    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+    const resp = await customRpcCall(umi, "getPriorityFeeEstimate", [
       {
         transaction: !useAccounts
           ? bs58.encode(web3Transaction.serialize())
@@ -332,10 +326,22 @@ export async function getComputeUnitPriceEstimate(
         },
       },
     ]);
+    // const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+    //   {
+    //     transaction: !useAccounts
+    //       ? bs58.encode(web3Transaction.serialize())
+    //       : undefined,
+    //     accountKeys: useAccounts ? accountKeys : undefined,
+    //     options: {
+    //       priorityLevel: prioritySetting.toString(),
+    //     },
+    //   },
+    // ]);
     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+    console.log(resp);
   } catch (e) {
     try {
-      const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+      const resp = await customRpcCall(umi, "getPriorityFeeEstimate", [
         {
           accountKeys,
           options: {
@@ -343,6 +349,14 @@ export async function getComputeUnitPriceEstimate(
           },
         },
       ]);
+      // const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+      //   {
+      //     accountKeys,
+      //     options: {
+      //       priorityLevel: prioritySetting.toString(),
+      //     },
+      //   },
+      // ]);
       feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
     } catch (e) {
       // console.error(e);
@@ -408,7 +422,10 @@ export async function sendSingleOptimizedTransaction(
   consoleLog("Sending single optimized transaction...");
   consoleLog("Instructions: ", tx.getInstructions().length);
   consoleLog("Serialized transaction size: ", tx.getTransactionSize(umi));
-  consoleLog("Programs: ", tx.getInstructions().map(x => x.programId));
+  consoleLog(
+    "Programs: ",
+    tx.getInstructions().map((x) => x.programId)
+  );
 
   const accounts = tx
     .getInstructions()

package/src/utils/solauto/generalUtils.ts

@@ -625,7 +625,7 @@ export function createSolautoSettings(
   };
 }
 
-type PositionAdjustment =
+type ContextAdjustment =
   | { type: "supply"; value: bigint }
   | { type: "debt"; value: bigint }
   | { type: "settings"; value: SolautoSettingsParametersInpArgs }
@@ -634,7 +634,7 @@ type PositionAdjustment =
   | { type: "cancellingDca"; value: TokenType }
   | { type: "jupSwap", value: QuoteResponse };
 
-export class LivePositionUpdates {
+export class ContextUpdates {
   public supplyAdjustment = BigInt(0);
   public debtAdjustment = BigInt(0);
   public settings: SolautoSettingsParameters | undefined = undefined;
@@ -643,7 +643,7 @@ export class LivePositionUpdates {
   public cancellingDca: TokenType | undefined = undefined;
   public jupSwap: QuoteResponse | undefined = undefined;
 
-  new(update: PositionAdjustment) {
+  new(update: ContextAdjustment) {
     if (update.type === "supply") {
       this.supplyAdjustment += update.value;
     } else if (update.type === "debt") {
@@ -684,7 +684,7 @@ export class LivePositionUpdates {
     this.jupSwap = undefined;
   }
 
-  hasUpdates(): boolean {
+  positionUpdates(): boolean {
     return (
       this.supplyAdjustment !== BigInt(0) ||
       this.debtAdjustment !== BigInt(0) ||

package/tests/transactions/solautoMarginfi.ts

@@ -44,12 +44,12 @@ import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
-  const payForTransactions = true;
-  const testProgram = false;
-  const positionId = 3;
+  const payForTransactions = false;
+  const testProgram = true;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -65,7 +65,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
+      // authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -145,7 +145,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 2000, attemptNum),
         "rebalance"
       )
     );