npm - @haven-fi/solauto-sdk - Versions diffs - 1.0.688 → 1.0.690 - Mend

@haven-fi/solauto-sdk 1.0.688 → 1.0.690

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/services/rebalance/rebalanceSwapManager.d.ts CHANGED Viewed

@@ -3,16 +3,18 @@ import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { SwapParams } from "../swap";
 import { RebalanceValues } from "./rebalanceValues";
+import { PriceType } from "../../generated";
 export declare class RebalanceSwapManager {
     private client;
     private values;
     private flRequirements?;
     private targetLiqUtilizationRateBps?;
+    private priceType?;
     swapParams: SwapParams;
     swapQuote?: QuoteResponse;
     flBorrowAmount?: bigint;
     private jupSwapManager;
-    constructor(client: SolautoClient, values: RebalanceValues, flRequirements?: FlashLoanRequirements | undefined, targetLiqUtilizationRateBps?: number | undefined);
+    constructor(client: SolautoClient, values: RebalanceValues, flRequirements?: FlashLoanRequirements | undefined, targetLiqUtilizationRateBps?: number | undefined, priceType?: PriceType | undefined);
     private isBoost;
     private usdToSwap;
     private postRebalanceLiqUtilizationRateBps;

package/dist/services/rebalance/rebalanceSwapManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;~~AAWpD~~,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;~~IAV/B~~,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA;~~IAK9C~~,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA2B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IA4EhC,aAAa;;;;;;CAWpB"}
1	+ {"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAU3E,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAXb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAK/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA2B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IA4EhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js CHANGED Viewed

@@ -6,11 +6,12 @@ const swap_1 = require("../swap");
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
 class RebalanceSwapManager {
-    constructor(client, values, flRequirements, targetLiqUtilizationRateBps) {
+    constructor(client, values, flRequirements, targetLiqUtilizationRateBps, priceType) {
         this.client = client;
         this.values = values;
         this.flRequirements = flRequirements;
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
+        this.priceType = priceType;
         this.jupSwapManager = new swap_1.JupSwapManager(client.signer);
     }
     isBoost() {
@@ -20,15 +21,15 @@ class RebalanceSwapManager {
         return Math.abs(this.values.debtAdjustmentUsd);
     }
     postRebalanceLiqUtilizationRateBps(swapOutputAmount) {
-        let supplyUsd = this.client.pos.supplyUsd();
+        let supplyUsd = this.client.pos.supplyUsd(this.priceType);
         // TODO: add token balance change
-        let debtUsd = this.client.pos.debtUsd();
+        let debtUsd = this.client.pos.debtUsd(this.priceType);
         const outputToken = this.isBoost()
             ? this.client.pos.supplyMint
             : this.client.pos.debtMint;
         const swapOutputUsd = swapOutputAmount
             ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)(outputToken).decimals) *
-                ((0, utils_1.safeGetPrice)(outputToken) ?? 0)
+                ((0, utils_1.safeGetPrice)(outputToken, this.priceType) ?? 0)
             : this.usdToSwap();
         supplyUsd = this.isBoost()
             ? supplyUsd + swapOutputUsd
@@ -68,7 +69,7 @@ class RebalanceSwapManager {
         const output = this.isBoost()
             ? this.client.pos.state.supply
             : this.client.pos.state.debt;
-        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint), input.decimals);
+        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint, this.priceType), input.decimals);
         return {
             input,
             output,
@@ -86,7 +87,7 @@ class RebalanceSwapManager {
                 BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                     // Add this small percentage to account for the APR on the debt between now and the transaction
                     0.0001))
-            : (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(output.mint), output.decimals);
+            : (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(output.mint, this.priceType), output.decimals);
         const flashLoanRepayFromDebt = !this.isBoost() &&
             this.flRequirements &&
             this.flRequirements.liquiditySource === generated_1.TokenType.Debt;

package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AA8BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;~~IA2C5B~~,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;~~IA2CnC~~,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;~~YAwBnB~~,sBAAsB;YAyBtB,mBAAmB;~~IAmEpB~~,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
1	+ {"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AA8BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAwEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js CHANGED Viewed

@@ -32,12 +32,9 @@ class RebalanceTxBuilder {
         const insufficientLiquidity = (amountNeededUsd, liquidityAvailable, tokenMint) => {
             const liquidityUsd = (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
                 ((0, utils_1.safeGetPrice)(tokenMint) ?? 0);
-            (0, utils_1.consoleLog)(liquidityUsd);
             return amountNeededUsd > liquidityUsd * 0.95;
         };
-        (0, utils_1.consoleLog)("Supply liquidity available:", supplyLiquidityAvailable);
         const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint);
-        (0, utils_1.consoleLog)("Debt liquidity available:", debtLiquidityAvailable);
         const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint);
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
             insufficientSupplyLiquidity;
@@ -73,7 +70,6 @@ class RebalanceTxBuilder {
         }
         const stdFlLiquiditySource = this.getFlLiquiditySource(this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
         if (stdFlLiquiditySource === undefined || this.optimizeSize) {
-            (0, utils_1.consoleLog)("Checking signer liquidity");
             const { supplyBalance, debtBalance } = await this.client.signerBalances();
             const signerFlLiquiditySource = this.getFlLiquiditySource(supplyBalance, debtBalance);
             if (signerFlLiquiditySource) {
@@ -163,7 +159,7 @@ class RebalanceTxBuilder {
         if (this.flRequirements?.flFeeBps) {
             this.values = this.getRebalanceValues();
         }
-        this.swapManager = new rebalanceSwapManager_1.RebalanceSwapManager(this.client, this.values, this.flRequirements, this.targetLiqUtilizationRateBps);
+        this.swapManager = new rebalanceSwapManager_1.RebalanceSwapManager(this.client, this.values, this.flRequirements, this.targetLiqUtilizationRateBps, this.priceType);
         await this.swapManager.setSwapParams(attemptNum);
         this.setRebalanceType();
         return true;
@@ -203,6 +199,7 @@ class RebalanceTxBuilder {
             priceType: this.priceType,
         };
         (0, utils_1.consoleLog)("Rebalance details:", rebalanceDetails);
+        (0, utils_1.consoleLog)("Prices:", (0, utils_1.safeGetPrice)(this.client.pos.supplyMint, this.priceType), (0, utils_1.safeGetPrice)(this.client.pos.debtMint, this.priceType));
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);
         const lastRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PostSwap, rebalanceDetails);
         if (!flashLoanDetails) {

package/dist/services/solauto/solautoClient.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAKL,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAChD,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CACtC,GACC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAC3C,IAAI,CACF,iBAAiB,EACjB,YAAY,GAAG,YAAY,GAAG,UAAU,GAAG,eAAe,CAC3D,CACF,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,QAAQ,CACpD,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CACzC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,QAAQ,CAC/C,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,UAAU,GAAG,eAAe,CAAC,CACrE,CAAC;AAEF,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAClC,KAAK,EAAG,UAAU,CAAC;IAEnB,SAAS,EAAG,SAAS,CAAC;IAEtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,iCAAiC,CAAC,IAAI,EAAE,2BAA2B;IAInE,4BAA4B,CAAC,IAAI,EAAE,sBAAsB;IAIzD,qCAAqC,CACzC,IAAI,EAAE,+BAA+B;IAKjC,gCAAgC,CAAC,IAAI,EAAE,0BAA0B;IAIjE,UAAU,CAAC,IAAI,EAAE,iBAAiB;~~IAyExC~~,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAe1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAezB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IAgEK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAgBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAcjC,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAE5D,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAqFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
1	+ {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/services/solauto/solautoClient.js CHANGED Viewed

@@ -55,6 +55,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         this.otherSigners.push(...this.flProvider.otherSigners());
         this.log("Position state: ", this.pos.state);
         this.log("Position settings: ", this.pos.settings);
+        this.log("Public key:", this.pos.publicKey.toString());
         this.log("Supply mint:", this.pos.supplyMint.toString());
         this.log("Debt mint:", this.pos.debtMint.toString());
         this.log("LP pool:", this.pos.lpPoolAccount.toString());

package/dist/services/transactions/manager/transactionsManager.d.ts CHANGED Viewed

@@ -26,7 +26,7 @@ interface RetryConfig {
     totalRetries?: number;
     retryDelay?: number;
 }
-export interface TransactionManagerArgs<T extends TxHandler> {
+export interface TransactionsManagerArgs<T extends TxHandler> {
     txHandler: T;
     statusCallback?: (statuses: TransactionManagerStatuses) => void;
     txRunType?: TransactionRunType;
@@ -48,7 +48,7 @@ export declare class TransactionsManager<T extends TxHandler> {
     protected totalRetries: number;
     protected retryDelay: number;
     updateOracleTxName: string;
-    constructor(args: TransactionManagerArgs<T>);
+    constructor(args: TransactionsManagerArgs<T>);
     private assembleTransactionSets;
     private updateStatus;
     private debugAccounts;

package/dist/services/transactions/manager/transactionsManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,~~sBAAsB~~,CAAC,CAAC,SAAS,SAAS;~~IACzD~~,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,~~sBAAsB~~,CAAC,CAAC,CAAC;~~YAmB7B~~,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAwDjC"}
1	+ {"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAmB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAwDjC"}

package/dist/utils/switchboardUtils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,~~CA6B5C~~;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
1	+ {"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkC5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}

package/dist/utils/switchboardUtils.js CHANGED Viewed

@@ -52,10 +52,16 @@ function getPullFeed(conn, mint, wallet) {
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
-    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({
-        chain: "solana",
-        network: "mainnet-beta",
-    }), 2, 200);
+    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
+        const res = await feed.fetchUpdateIx({
+            chain: "solana",
+            network: "mainnet-beta",
+        });
+        if (!res[1] || !res[1][0].value) {
+            throw new Error("Unable to fetch Switchboard pull IX");
+        }
+        return res;
+    }, 3, 200);
     if (!pullIx) {
         throw new Error("Unable to fetch SWB crank IX");
     }

package/local/txSandbox.ts CHANGED Viewed

@@ -1,16 +1,21 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
+  fetchBank,
+  fetchMarginfiAccount,
   getBatches,
   getClient,
+  getLiqUtilzationRateBps,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  marginfiAccountEmpty,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -23,7 +28,7 @@ import {
 import { getSecretKey } from "./shared";
 const payForTransaction = false;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 let [, umi] = getSolanaRpcConnection(
@@ -47,23 +52,81 @@ export async function main() {
   });
   await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    positionId: 2,
+    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
-  const transactionItems = [rebalance(client)];
+  const supplyBank = await fetchBank(
+    umi,
+    publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  );
+  const debtBank = await fetchBank(
+    umi,
+    publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  );
+  const supplyWeight = bytesToI80F48(supplyBank.config.assetWeightInit.value);
+  const debtWeight = bytesToI80F48(debtBank.config.liabilityWeightInit.value);
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 5 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  console.log(
+    getLiqUtilzationRateBps(
+      34.36833665228071,
+      23.61750715267401,
+      client.pos.state.liqThresholdBps
+    ),
+    34.36833665228071 * supplyWeight,
+    23.61750715267401 * debtWeight
+  );
+  console.log(
+    getLiqUtilzationRateBps(
+      34.328721976,
+      23.575158311,
+      client.pos.state.liqThresholdBps
+    ),
+    34.328721976 * supplyWeight,
+    23.575158311 * debtWeight
+  );
+  console.log(
+    getLiqUtilzationRateBps(
+      34.265152701,
+      23.530695876,
+      client.pos.state.liqThresholdBps
+    ),
+    34.265152701 * supplyWeight,
+    23.530695876 * debtWeight
+  );
+  console.log(client.pos.maxBoostToBps);
+  // const debtBank = await fetchBank(
+  //   umi,
+  //   publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  // );
+  // const supplyBank = await fetchBank(
+  //   umi,
+  //   publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  // );
+  // console.log(
+  //   bytesToI80F48(supplyBank.config.assetWeightInit.value),
+  //   bytesToI80F48(debtBank.config.liabilityWeightInit.value)
+  // );
+  // await client.pos.refreshPositionState();
+  // console.log(await client.pos.utilizationRateBpsDrift());
+  // const transactionItems = [rebalance(client)];
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 5 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
 }
 async function refreshAll() {

package/package.json CHANGED Viewed

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

package/src/services/rebalance/rebalanceSwapManager.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
 import { RebalanceValues } from "./rebalanceValues";
-import { RebalanceDirection, TokenType } from "../../generated";
+import { PriceType, RebalanceDirection, TokenType } from "../../generated";
 import {
   consoleLog,
   fromBaseUnit,
@@ -25,7 +25,8 @@ export class RebalanceSwapManager {
     private client: SolautoClient,
     private values: RebalanceValues,
     private flRequirements?: FlashLoanRequirements,
-    private targetLiqUtilizationRateBps?: number
+    private targetLiqUtilizationRateBps?: number,
+    private priceType?: PriceType
   ) {
     this.jupSwapManager = new JupSwapManager(client.signer);
   }
@@ -39,16 +40,16 @@ export class RebalanceSwapManager {
   }
   private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
-    let supplyUsd = this.client.pos.supplyUsd();
+    let supplyUsd = this.client.pos.supplyUsd(this.priceType);
     // TODO: add token balance change
-    let debtUsd = this.client.pos.debtUsd();
+    let debtUsd = this.client.pos.debtUsd(this.priceType);
     const outputToken = this.isBoost()
       ? this.client.pos.supplyMint
       : this.client.pos.debtMint;
     const swapOutputUsd = swapOutputAmount
       ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
-        (safeGetPrice(outputToken) ?? 0)
+        (safeGetPrice(outputToken, this.priceType) ?? 0)
       : this.usdToSwap();
     supplyUsd = this.isBoost()
@@ -110,7 +111,7 @@ export class RebalanceSwapManager {
       : this.client.pos.state.debt;
     let inputAmount = toBaseUnit(
-      this.usdToSwap() / safeGetPrice(input.mint)!,
+      this.usdToSwap() / safeGetPrice(input.mint, this.priceType)!,
       input.decimals
     );
@@ -139,7 +140,7 @@ export class RebalanceSwapManager {
           )
         )
       : toBaseUnit(
-          this.usdToSwap() / safeGetPrice(output.mint)!,
+          this.usdToSwap() / safeGetPrice(output.mint, this.priceType)!,
           output.decimals
         );

package/src/services/rebalance/rebalanceTxBuilder.ts CHANGED Viewed

@@ -91,18 +91,15 @@ export class RebalanceTxBuilder {
       const liquidityUsd =
         fromBaseUnit(liquidityAvailable, tokenInfo(tokenMint).decimals) *
         (safeGetPrice(tokenMint) ?? 0);
-      consoleLog(liquidityUsd);
       return amountNeededUsd > liquidityUsd * 0.95;
     };
-    consoleLog("Supply liquidity available:", supplyLiquidityAvailable);
     const insufficientSupplyLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       supplyLiquidityAvailable,
       this.client.pos.supplyMint
     );
-    consoleLog("Debt liquidity available:", debtLiquidityAvailable);
     const insufficientDebtLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       debtLiquidityAvailable,
@@ -172,7 +169,6 @@ export class RebalanceTxBuilder {
     );
     if (stdFlLiquiditySource === undefined || this.optimizeSize) {
-      consoleLog("Checking signer liquidity");
       const { supplyBalance, debtBalance } = await this.client.signerBalances();
       const signerFlLiquiditySource = this.getFlLiquiditySource(
         supplyBalance,
@@ -287,7 +283,8 @@ export class RebalanceTxBuilder {
       this.client,
       this.values,
       this.flRequirements,
-      this.targetLiqUtilizationRateBps
+      this.targetLiqUtilizationRateBps,
+      this.priceType
     );
     await this.swapManager.setSwapParams(attemptNum);
@@ -343,6 +340,11 @@ export class RebalanceTxBuilder {
       priceType: this.priceType,
     };
     consoleLog("Rebalance details:", rebalanceDetails);
+    consoleLog(
+      "Prices:",
+      safeGetPrice(this.client.pos.supplyMint, this.priceType),
+      safeGetPrice(this.client.pos.debtMint, this.priceType)
+    );
     const firstRebalance = this.client.rebalanceIx(
       RebalanceStep.PreSwap,

package/src/services/solauto/solautoClient.ts CHANGED Viewed

@@ -179,6 +179,7 @@ export abstract class SolautoClient extends ReferralStateManager {
     this.log("Position state: ", this.pos.state);
     this.log("Position settings: ", this.pos.settings);
+    this.log("Public key:", this.pos.publicKey.toString());
     this.log("Supply mint:", this.pos.supplyMint.toString());
     this.log("Debt mint:", this.pos.debtMint.toString());
     this.log("LP pool:", this.pos.lpPoolAccount.toString());

package/src/services/transactions/manager/transactionsManager.ts CHANGED Viewed

@@ -48,7 +48,7 @@ interface RetryConfig {
   retryDelay?: number;
 }
-export interface TransactionManagerArgs<T extends TxHandler> {
+export interface TransactionsManagerArgs<T extends TxHandler> {
   txHandler: T;
   statusCallback?: (statuses: TransactionManagerStatuses) => void;
   txRunType?: TransactionRunType;
@@ -73,7 +73,7 @@ export class TransactionsManager<T extends TxHandler> {
   updateOracleTxName = "update oracle";
-  constructor(args: TransactionManagerArgs<T>) {
+  constructor(args: TransactionsManagerArgs<T>) {
     this.txHandler = args.txHandler;
     this.statusCallback = args.statusCallback;
     this.txRunType = args.txRunType;

package/src/utils/switchboardUtils.ts CHANGED Viewed

@@ -53,12 +53,17 @@ export async function buildSwbSubmitResponseTx(
 ): Promise<TransactionItemInputs | undefined> {
   const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
   const [pullIx, responses] = await retryWithExponentialBackoff(
-    async () =>
-      await feed.fetchUpdateIx({
+    async () => {
+      const res = await feed.fetchUpdateIx({
         chain: "solana",
         network: "mainnet-beta",
-      }),
-    2,
+      });
+      if (!res[1] || !res[1][0].value) {
+        throw new Error("Unable to fetch Switchboard pull IX");
+      }
+      return res;
+    },
+    3,
     200
   );
@@ -111,4 +116,4 @@ export async function getSwitchboardFeedData(
 export function isSwitchboardMint(mint: PublicKey | string) {
   return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
-}
+}