@haven-fi/solauto-sdk 1.0.554 → 1.0.556

package/dist/clients/solautoClient.d.ts

@@ -3,7 +3,7 @@ import { PublicKey } from "@solana/web3.js";
 import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, SolautoActionArgs, SolautoPosition, SolautoRebalanceType, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
 import { FlashLoanDetails, RebalanceValues } from "../utils/solauto/rebalanceUtils";
-import { LivePositionUpdates } from "../utils/solauto/generalUtils";
+import { ContextUpdates } from "../utils/solauto/generalUtils";
 import { ReferralStateManager, ReferralStateManagerArgs } from "./referralStateManager";
 import { QuoteResponse } from "@jup-ag/api";
 export interface SolautoClientArgs extends ReferralStateManagerArgs {
@@ -31,7 +31,7 @@ export declare abstract class SolautoClient extends ReferralStateManager {
     solautoFeesSupplyTa: PublicKey;
     solautoFeesDebtTa: PublicKey;
     authorityLutAddress?: PublicKey;
-    livePositionUpdates: LivePositionUpdates;
+    contextUpdates: ContextUpdates;
     private signerSupplyBalance;
     private signerDebtBalance;
     initialize(args: SolautoClientArgs): Promise<void>;

package/dist/clients/solautoClient.d.ts.map

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

package/dist/clients/solautoClient.js

@@ -16,7 +16,7 @@ const referralStateManager_1 = require("./referralStateManager");
 class SolautoClient extends referralStateManager_1.ReferralStateManager {
     constructor() {
         super(...arguments);
-        this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
+        this.contextUpdates = new generalUtils_2.ContextUpdates();
     }
     async initialize(args) {
         await super.initialize(args);
@@ -75,18 +75,18 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition), { 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();
     }
     defaultLookupTables() {
         return [
@@ -185,11 +185,11 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         };
     }
     solautoPositionSettings() {
-        return (this.livePositionUpdates.settings ??
+        return (this.contextUpdates.settings ??
             this.solautoPositionData?.position.settingParams);
     }
     solautoPositionActiveDca() {
-        return (this.livePositionUpdates.activeDca ??
+        return (this.contextUpdates.activeDca ??
             this.solautoPositionData?.position.dca);
     }
     async maxLtvAndLiqThresholdBps() {
@@ -200,7 +200,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
     }
     openPosition(settingParams, dca) {
         if (dca && dca.dcaInBaseUnit > 0) {
-            this.livePositionUpdates.new({
+            this.contextUpdates.new({
                 type: "dcaInBalance",
                 value: {
                     amount: BigInt(dca.dcaInBaseUnit),
@@ -209,13 +209,13 @@ class SolautoClient extends referralStateManager_1.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,
             });
@@ -240,7 +240,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             if ((0, umi_1.isOption)(args.dca) &&
                 (0, umi_1.isSome)(args.dca) &&
                 args.dca.value.dcaInBaseUnit > 0) {
-                this.livePositionUpdates.new({
+                this.contextUpdates.new({
                     type: "dcaInBalance",
                     value: {
                         amount: BigInt(args.dca.value.dcaInBaseUnit),
@@ -250,13 +250,13 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             }
         }
         if ((0, umi_1.isOption)(args.settingParams) && (0, umi_1.isSome)(args.settingParams)) {
-            this.livePositionUpdates.new({
+            this.contextUpdates.new({
                 type: "settings",
                 value: args.settingParams.value,
             });
         }
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
-            this.livePositionUpdates.new({
+            this.contextUpdates.new({
                 type: "dca",
                 value: args.dca.value,
             });
@@ -297,7 +297,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
-            this.livePositionUpdates.new({
+            this.contextUpdates.new({
                 type: "cancellingDca",
                 value: this.solautoPositionData.position.dca.tokenType,
             });
@@ -327,20 +327,20 @@ class SolautoClient extends referralStateManager_1.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 ??
                         BigInt(0)) * BigInt(-1),
@@ -348,20 +348,20 @@ class SolautoClient extends referralStateManager_1.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)) *
                         BigInt(-1),
@@ -375,7 +375,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             Boolean(this.solautoPositionState) &&
             Number(this.solautoPositionState.lastUpdated) >
                 (0, generalUtils_1.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
-            !this.livePositionUpdates.hasUpdates()) {
+            !this.contextUpdates.positionUpdates()) {
             return this.solautoPositionState;
         }
         return undefined;

package/dist/clients/solautoMarginfiClient.js

@@ -467,7 +467,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const useDesignatedMint = !this.selfManaged &&
             (this.solautoPositionData === null ||
                 !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority));
-        const resp = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.marginfiAccountPk }, this.marginfiGroup, useDesignatedMint ? { mint: this.supplyMint } : undefined, useDesignatedMint ? { mint: this.debtMint } : undefined, this.livePositionUpdates);
+        const resp = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.marginfiAccountPk }, this.marginfiGroup, useDesignatedMint ? { mint: this.supplyMint } : undefined, useDesignatedMint ? { mint: this.debtMint } : undefined, this.contextUpdates);
         if (resp) {
             this.supplyBank = resp?.supplyBank;
             this.debtBank = resp?.debtBank;

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,iBAAiB,0CAA0C,CAAC;AAEzE,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAMF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAG3B,eAAO,MAAM,aAAa,UAOzB,CAAA"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,iBAAiB,0CAA0C,CAAC;AAEzE,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAG3B,eAAO,MAAM,aAAa,UAOzB,CAAA"}

package/dist/constants/solautoConstants.js

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

package/dist/transactions/transactionUtils.js

@@ -323,10 +323,10 @@ async function getTransactionChores(client, tx) {
     const accountsGettingCreated = [];
     const solautoActions = getSolautoActions(client.umi, tx);
     choresBefore = choresBefore.add([
-        await transactionChoresBefore(client, accountsGettingCreated, solautoActions, client.livePositionUpdates.dcaInBalance),
+        await transactionChoresBefore(client, accountsGettingCreated, solautoActions, client.contextUpdates.dcaInBalance),
         await rebalanceChoresBefore(client, tx, accountsGettingCreated),
     ]);
-    choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.livePositionUpdates.cancellingDca));
+    choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.contextUpdates.cancellingDca));
     return [choresBefore, choresAfter];
 }
 async function requiresRefreshBeforeRebalance(client) {
@@ -341,16 +341,16 @@ async function requiresRefreshBeforeRebalance(client) {
         return true;
     }
     else if (client.solautoPositionData && !client.selfManaged) {
-        if (client.livePositionUpdates.supplyAdjustment > BigInt(0) ||
-            client.livePositionUpdates.debtAdjustment > BigInt(0)) {
+        if (client.contextUpdates.supplyAdjustment > BigInt(0) ||
+            client.contextUpdates.debtAdjustment > BigInt(0)) {
             return false;
         }
         const oldStateWithLatestPrices = await (0, generalUtils_2.positionStateWithLatestPrices)(client.solautoPositionData.state, constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price);
         const utilizationRateDiff = Math.abs((client.solautoPositionState?.liqUtilizationRateBps ?? 0) -
             oldStateWithLatestPrices.liqUtilizationRateBps);
         client.log("Liq utilization rate diff:", utilizationRateDiff);
-        if (client.livePositionUpdates.supplyAdjustment === BigInt(0) &&
-            client.livePositionUpdates.debtAdjustment === BigInt(0) &&
+        if (client.contextUpdates.supplyAdjustment === BigInt(0) &&
+            client.contextUpdates.debtAdjustment === BigInt(0) &&
             utilizationRateDiff >= 10) {
             client.log("Choosing to refresh before rebalance. Utilization rate diff:", utilizationRateDiff);
             return true;
@@ -365,7 +365,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     const supplyPrice = (0, utils_1.safeGetPrice)(client.supplyMint) ?? 0;
     const debtPrice = (0, utils_1.safeGetPrice)(client.debtMint) ?? 0;
     if ((client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
-        client.livePositionUpdates.supplyAdjustment === BigInt(0)) ||
+        client.contextUpdates.supplyAdjustment === BigInt(0)) ||
         (targetLiqUtilizationRateBps === undefined &&
             !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice))) {
         client.log("Not eligible for a rebalance");

package/dist/utils/generalUtils.d.ts

@@ -15,4 +15,5 @@ export declare function zip<T, U>(list1: T[], list2: U[]): [T, U][];
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number, prevErr?: Error) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
 export declare function toEnumValue<E extends object>(enumObj: E, value: number): E[keyof E] | undefined;
+export declare function customRpcCall(umi: Umi, method: string, params?: any): Promise<any>;
 //# sourceMappingURL=generalUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAGrD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE"}

package/dist/utils/generalUtils.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLog = consoleLog;
 exports.tokenInfo = tokenInfo;
@@ -13,9 +16,11 @@ exports.arraysAreEqual = arraysAreEqual;
 exports.zip = zip;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
 exports.toEnumValue = toEnumValue;
+exports.customRpcCall = customRpcCall;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const constants_1 = require("../constants");
+const axios_1 = __importDefault(require("axios"));
 function consoleLog(...args) {
     if (globalThis.LOCAL_TEST) {
         console.log(...args);
@@ -120,3 +125,21 @@ function toEnumValue(enumObj, value) {
     }
     return undefined;
 }
+async function customRpcCall(umi, method, params) {
+    const data = (await axios_1.default.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/dist/utils/jitoUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAqOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AA4OD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}

package/dist/utils/jitoUtils.js

@@ -46,28 +46,45 @@ function parseJitoErrorMessage(message) {
 }
 async function simulateJitoBundle(umi, txs) {
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const resp = await axios_1.default.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",
+        const res = await (0, generalUtils_1.customRpcCall)(umi, "simulateBundle", [
+            {
+                encodedTransactions: txs.map((x) => Buffer.from(x.serialize()).toString("base64")),
             },
-        });
-        const res = resp.data;
+            {
+                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;
             const transactionResults = resValue.transactionResults;
@@ -120,16 +137,11 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
     return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
 }
 async function getBundleStatus(umi, bundleId) {
-    const res = await axios_1.default.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 (0, generalUtils_1.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(umi, bundleId, interval = 1000, timeout = 40000) {
     const endTime = Date.now() + timeout;

package/dist/utils/marginfiUtils.d.ts

@@ -3,7 +3,7 @@ import { Umi } from "@metaplex-foundation/umi";
 import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
-import { LivePositionUpdates } from "./solauto/generalUtils";
+import { ContextUpdates } from "./solauto/generalUtils";
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
     mint: PublicKey;
 }
@@ -34,7 +34,7 @@ type BanksCache = {
 export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccount: {
     pk: PublicKey;
     data?: MarginfiAccount;
-}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, livePositionUpdates?: LivePositionUpdates): Promise<{
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, contextUpdates?: ContextUpdates): Promise<{
     supplyBank: Bank | null;
     debtBank: Bank | null;
     state: PositionState;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAmDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CAiMA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAmDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CAiMA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfiUtils.js

@@ -165,7 +165,7 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
         padding: new Uint8Array([]),
     };
 }
-async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, livePositionUpdates) {
+async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, contextUpdates) {
     let marginfiAccount = protocolAccount.data ??
         (await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
             commitment: "confirmed",
@@ -208,7 +208,7 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
             if (!supply.mint) {
                 supply.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint);
             }
-            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), livePositionUpdates?.supplyAdjustment);
+            supplyUsage = await getTokenUsage(supplyBank, true, (0, numberUtils_1.bytesToI80F48)(supplyBalances[0].assetShares.value), contextUpdates?.supplyAdjustment);
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
@@ -219,14 +219,14 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
             if (!debt.mint) {
                 debt.mint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint);
             }
-            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
+            debtUsage = await getTokenUsage(debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), contextUpdates?.debtAdjustment);
         }
     }
     if (supplyBank === null) {
         return undefined;
     }
     if (!supplyUsage) {
-        supplyUsage = await getTokenUsage(supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
+        supplyUsage = await getTokenUsage(supplyBank, true, 0, contextUpdates?.supplyAdjustment);
     }
     if (debtBank === null) {
         return undefined;
@@ -243,7 +243,7 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
         return undefined;
     }
     if (!debtUsage) {
-        debtUsage = await getTokenUsage(debtBank, false, 0, livePositionUpdates?.debtAdjustment);
+        debtUsage = await getTokenUsage(debtBank, false, 0, contextUpdates?.debtAdjustment);
     }
     const supplyPrice = (0, priceUtils_1.safeGetPrice)(supply.mint);
     let [maxLtv, liqThreshold] = await getMarginfiMaxLtvAndLiqThreshold(umi, marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP), {

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AA+CD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoEjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4D7B;AA+CD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAuEjC"}

package/dist/utils/solanaUtils.js

@@ -31,7 +31,6 @@ const marginfi_sdk_1 = require("../marginfi-sdk");
 const types_1 = require("../types");
 const solauto_1 = require("./solauto");
 const constants_1 = require("../constants");
-const axios_1 = __importDefault(require("axios"));
 function buildHeliusApiUrl(heliusApiKey) {
     return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
 }
@@ -153,15 +152,10 @@ async function simulateTransaction(umi, connection, transaction) {
     return simulationResult;
 }
 async function getQnComputeUnitPriceEstimate(umi, programId, blockheight = 50) {
-    return (await axios_1.default.post(umi.rpc.getEndpoint(), {
-        method: "qn_estimatePriorityFees",
-        jsonrpc: "2.0",
-        id: 1,
-        params: {
-            last_n_blocks: blockheight,
-            account: programId.toString(),
-        },
-    })).data;
+    return await (0, generalUtils_1.customRpcCall)(umi, "qn_estimatePriorityFees", {
+        last_n_blocks: blockheight,
+        account: programId.toString(),
+    });
 }
 async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts) {
     const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
@@ -170,7 +164,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
         .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
     let feeEstimate;
     try {
-        const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+        const resp = await (0, generalUtils_1.customRpcCall)(umi, "getPriorityFeeEstimate", [
             {
                 transaction: !useAccounts
                     ? bs58_1.default.encode(web3Transaction.serialize())
@@ -181,11 +175,23 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
                 },
             },
         ]);
+        // 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.priorityFeeEstimate);
+        console.log(resp);
     }
     catch (e) {
         try {
-            const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+            const resp = await (0, generalUtils_1.customRpcCall)(umi, "getPriorityFeeEstimate", [
                 {
                     accountKeys,
                     options: {
@@ -193,6 +199,14 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
                     },
                 },
             ]);
+            // const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+            //   {
+            //     accountKeys,
+            //     options: {
+            //       priorityLevel: prioritySetting.toString(),
+            //     },
+            //   },
+            // ]);
             feeEstimate = Math.round(resp.priorityFeeEstimate);
         }
         catch (e) {
@@ -235,7 +249,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     (0, generalUtils_1.consoleLog)("Sending single optimized transaction...");
     (0, generalUtils_1.consoleLog)("Instructions: ", tx.getInstructions().length);
     (0, generalUtils_1.consoleLog)("Serialized transaction size: ", tx.getTransactionSize(umi));
-    (0, generalUtils_1.consoleLog)("Programs: ", tx.getInstructions().map(x => x.programId));
+    (0, generalUtils_1.consoleLog)("Programs: ", tx.getInstructions().map((x) => x.programId));
     const accounts = tx
         .getInstructions()
         .flatMap((x) => [

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

@@ -24,7 +24,7 @@ interface AssetProps {
 }
 export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
 export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;
-type PositionAdjustment = {
+type ContextAdjustment = {
     type: "supply";
     value: bigint;
 } | {
@@ -49,7 +49,7 @@ type PositionAdjustment = {
     type: "jupSwap";
     value: QuoteResponse;
 };
-export declare class LivePositionUpdates {
+export declare class ContextUpdates {
     supplyAdjustment: bigint;
     debtAdjustment: bigint;
     settings: SolautoSettingsParameters | undefined;
@@ -60,9 +60,9 @@ export declare class LivePositionUpdates {
     };
     cancellingDca: TokenType | undefined;
     jupSwap: QuoteResponse | undefined;
-    new(update: PositionAdjustment): void;
+    new(update: ContextAdjustment): void;
     reset(): void;
-    hasUpdates(): boolean;
+    positionUpdates(): boolean;
 }
 export {};
 //# sourceMappingURL=generalUtils.d.ts.map