@haven-fi/solauto-sdk 1.0.71 → 1.0.73

package/dist/clients/solautoMarginfiClient.d.ts

@@ -20,6 +20,8 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiGroup: PublicKey;
     marginfiSupplyAccounts: MarginfiAssetAccounts;
     marginfiDebtAccounts: MarginfiAssetAccounts;
+    supplyPriceOracle: PublicKey;
+    debtPriceOracle: PublicKey;
     intermediaryMarginfiAccountSigner?: Signer;
     intermediaryMarginfiAccountPk: PublicKey;
     intermediaryMarginfiAccount?: MarginfiAccount;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAG7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAuC1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA6ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAGL,eAAe,EAYhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAkD1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAgFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -43,6 +43,15 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiSupplyAccounts =
             marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()];
         this.marginfiDebtAccounts = marginfiAccounts_1.MARGINFI_ACCOUNTS[this.debtMint.toString()];
+        // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+        // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
+        //   publicKey(this.marginfiSupplyAccounts.bank),
+        //   publicKey(this.marginfiDebtAccounts.bank),
+        // ]);
+        // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
+        // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
+        this.supplyPriceOracle = new web3_js_1.PublicKey(this.marginfiSupplyAccounts.priceOracle);
+        this.debtPriceOracle = new web3_js_1.PublicKey(this.marginfiDebtAccounts.priceOracle);
         if (!this.initialized) {
             await this.setIntermediaryMarginfiDetails();
         }
@@ -140,9 +149,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
         });
     }
@@ -231,8 +240,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         let supplyPriceOracle = undefined;
         let debtPriceOracle = undefined;
         if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-            supplyPriceOracle = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle);
-            debtPriceOracle = (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle);
+            supplyPriceOracle = (0, umi_1.publicKey)(this.supplyPriceOracle);
+            debtPriceOracle = (0, umi_1.publicKey)(this.debtPriceOracle);
         }
         return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
             signer: this.signer,
@@ -276,7 +285,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
             intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), swapDetails.inputMint)),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             signerSupplyTa: this.selfManaged
                 ? (0, umi_1.publicKey)(this.signerSupplyTa)
@@ -288,7 +297,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority)
                 : undefined,
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
+            debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
             vaultDebtTa: needDebtAccounts
@@ -325,17 +334,21 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }));
     }
     flashRepay(flashLoanDetails) {
-        const bank = flashLoanDetails.mint.equals(this.supplyMint)
-            ? this.marginfiSupplyAccounts
-            : this.marginfiDebtAccounts;
+        const accounts = flashLoanDetails.mint.equals(this.supplyMint)
+            ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
+            : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
         const remainingAccounts = [];
         let includedFlashLoanToken = false;
         if (this.intermediaryMarginfiAccount) {
-            this.intermediaryMarginfiAccount.lendingAccount.balances.forEach((x) => {
+            this.intermediaryMarginfiAccount.lendingAccount.balances.forEach(async (x) => {
                 if (x.active) {
-                    if (x.bankPk === bank.bank) {
+                    if (x.bankPk === accounts.data.bank) {
                         includedFlashLoanToken = true;
                     }
+                    // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+                    // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
+                    // const priceOracle = bankData!.config.oracleKeys[0];
+                    const priceOracle = (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk)).priceOracle);
                     remainingAccounts.push(...[
                         {
                             pubkey: x.bankPk,
@@ -343,7 +356,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                             isWritable: false,
                         },
                         {
-                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk)).priceOracle),
+                            pubkey: priceOracle,
                             isSigner: false,
                             isWritable: false,
                         },
@@ -354,12 +367,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (!this.intermediaryMarginfiAccount || !includedFlashLoanToken) {
             remainingAccounts.push(...[
                 {
-                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(bank.bank)),
+                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(accounts.data.bank)),
                     isSigner: false,
                     isWritable: false,
                 },
                 {
-                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(bank.priceOracle)),
+                    pubkey: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(new web3_js_1.PublicKey(accounts.oracle)),
                     isSigner: false,
                     isWritable: false,
                 },
@@ -369,8 +382,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
             amount: flashLoanDetails.baseUnitAmount,
             repayAll: null,
-            bank: (0, umi_1.publicKey)(bank.bank),
-            bankLiquidityVault: (0, umi_1.publicKey)(bank.liquidityVault),
+            bank: (0, umi_1.publicKey)(accounts.data.bank),
+            bankLiquidityVault: (0, umi_1.publicKey)(accounts.data.liquidityVault),
             marginfiAccount: (0, umi_1.publicKey)(this.intermediaryMarginfiAccountPk),
             marginfiGroup: (0, umi_1.publicKey)(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP),
             signer: this.signer,

package/dist/constants/solautoConstants.d.ts

@@ -1,7 +1,8 @@
-export declare const DEFAULT_RISK_AVERSION_BPS = 1500;
+export declare const BASIS_POINTS = 10000;
 export declare const DEFAULT_LIMIT_GAP_BPS = 1000;
 export declare const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
-export declare const MAX_REPAY_GAP_BPS = 100;
+export declare const MIN_REPAY_GAP_BPS = 100;
+export declare const MIN_BOOST_GAP_BPS = 50;
 export declare const PRICES: {
     [key: string]: {
         price: number;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAQrC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAE1E,eAAO,MAAM,kBAAkB,gDAAgD,CAAC;AAEhF,eAAO,MAAM,qBAAqB,UAWjC,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAQpC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAE1E,eAAO,MAAM,kBAAkB,gDAAgD,CAAC;AAEhF,eAAO,MAAM,qBAAqB,UAWjC,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.JUPITER_PROGRAM_ID = exports.SOLAUTO_LUT = exports.PRICES = exports.MAX_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.DEFAULT_RISK_AVERSION_BPS = void 0;
+exports.STANDARD_LUT_ACCOUNTS = exports.JUPITER_PROGRAM_ID = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.BASIS_POINTS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 // import { JitoRpcConnection } from "jito-ts";
 const generated_1 = require("../generated");
 const generalAccounts_1 = require("./generalAccounts");
-exports.DEFAULT_RISK_AVERSION_BPS = 1500;
+exports.BASIS_POINTS = 10000;
 exports.DEFAULT_LIMIT_GAP_BPS = 1000;
 exports.MIN_POSITION_STATE_FRESHNESS_SECS = 5;
-exports.MAX_REPAY_GAP_BPS = 100;
+exports.MIN_REPAY_GAP_BPS = 100;
+exports.MIN_BOOST_GAP_BPS = 50;
 // export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
 // export const JITO_CONNECTION = new JitoRpcConnection(
 //   `https://${JITO_BLOCK_ENGINE}`,

package/dist/generated/errors/solauto.d.ts

@@ -42,8 +42,8 @@ export declare class StaleProtocolDataError extends ProgramError {
     readonly code: number;
     constructor(program: Program, cause?: Error);
 }
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-export declare class UnableToRepositionError extends ProgramError {
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+export declare class UnableToRebalanceError extends ProgramError {
     readonly name: string;
     readonly code: number;
     constructor(program: Program, cause?: Error);

package/dist/generated/errors/solauto.d.ts.map

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

package/dist/generated/errors/solauto.js

@@ -7,7 +7,7 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncorrectInstructionsError = exports.RebalanceAbuseError = exports.InstructionIsCPIError = exports.InvalidRebalanceConditionError = exports.ExceededValidUtilizationRateError = exports.UnableToRepositionError = exports.StaleProtocolDataError = exports.InvalidAutomationDataError = exports.InvalidDCASettingsError = exports.InvalidPositionSettingsError = exports.FailedAccountDeserializationError = exports.IncorrectAccountsError = void 0;
+exports.IncorrectInstructionsError = exports.RebalanceAbuseError = exports.InstructionIsCPIError = exports.InvalidRebalanceConditionError = exports.ExceededValidUtilizationRateError = exports.UnableToRebalanceError = exports.StaleProtocolDataError = exports.InvalidAutomationDataError = exports.InvalidDCASettingsError = exports.InvalidPositionSettingsError = exports.FailedAccountDeserializationError = exports.IncorrectAccountsError = void 0;
 exports.getSolautoErrorFromCode = getSolautoErrorFromCode;
 exports.getSolautoErrorFromName = getSolautoErrorFromName;
 const umi_1 = require("@metaplex-foundation/umi");
@@ -79,17 +79,17 @@ class StaleProtocolDataError extends umi_1.ProgramError {
 exports.StaleProtocolDataError = StaleProtocolDataError;
 codeToErrorMap.set(0x5, StaleProtocolDataError);
 nameToErrorMap.set('StaleProtocolData', StaleProtocolDataError);
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-class UnableToRepositionError extends umi_1.ProgramError {
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+class UnableToRebalanceError extends umi_1.ProgramError {
     constructor(program, cause) {
         super('Unable to adjust position to the desired utilization rate', program, cause);
-        this.name = 'UnableToReposition';
+        this.name = 'UnableToRebalance';
         this.code = 0x6; // 6
     }
 }
-exports.UnableToRepositionError = UnableToRepositionError;
-codeToErrorMap.set(0x6, UnableToRepositionError);
-nameToErrorMap.set('UnableToReposition', UnableToRepositionError);
+exports.UnableToRebalanceError = UnableToRebalanceError;
+codeToErrorMap.set(0x6, UnableToRebalanceError);
+nameToErrorMap.set('UnableToRebalance', UnableToRebalanceError);
 /** ExceededValidUtilizationRate: Desired action brought the utilization rate to an unsafe amount */
 class ExceededValidUtilizationRateError extends umi_1.ProgramError {
     constructor(program, cause) {

package/dist/marginfi-sdk/types/oracleSetup.d.ts

@@ -9,8 +9,9 @@ import { Serializer } from '@metaplex-foundation/umi/serializers';
 export declare enum OracleSetup {
     None = 0,
     PythLegacy = 1,
-    SwitchboardV2 = 2,
-    PythPushOracle = 3
+    SwitchboardLegacy = 2,
+    PythPushOracle = 3,
+    SwitchboardPull = 4
 }
 export type OracleSetupArgs = OracleSetup;
 export declare function getOracleSetupSerializer(): Serializer<OracleSetupArgs, OracleSetup>;

package/dist/marginfi-sdk/types/oracleSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,UAAU,IAAA;IACV,aAAa,IAAA;IACb,cAAc,IAAA;CACf;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}
+{"version":3,"file":"oracleSetup.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/oracleSetup.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,UAAU,IAAA;IACV,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,eAAe,IAAA;CAChB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAE1C,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAIA"}

package/dist/marginfi-sdk/types/oracleSetup.js

@@ -14,8 +14,9 @@ var OracleSetup;
 (function (OracleSetup) {
     OracleSetup[OracleSetup["None"] = 0] = "None";
     OracleSetup[OracleSetup["PythLegacy"] = 1] = "PythLegacy";
-    OracleSetup[OracleSetup["SwitchboardV2"] = 2] = "SwitchboardV2";
+    OracleSetup[OracleSetup["SwitchboardLegacy"] = 2] = "SwitchboardLegacy";
     OracleSetup[OracleSetup["PythPushOracle"] = 3] = "PythPushOracle";
+    OracleSetup[OracleSetup["SwitchboardPull"] = 4] = "SwitchboardPull";
 })(OracleSetup || (exports.OracleSetup = OracleSetup = {}));
 function getOracleSetupSerializer() {
     return (0, serializers_1.scalarEnum)(OracleSetup, {

package/dist/marginfi-sdk/types/wrappedI80F48.d.ts

@@ -5,7 +5,7 @@
  *
  * @see https://github.com/metaplex-foundation/kinobi
  */
-import { Serializer } from '@metaplex-foundation/umi/serializers';
+import { Serializer } from "@metaplex-foundation/umi/serializers";
 export type WrappedI80F48 = {
     value: number[];
 };

package/dist/marginfi-sdk/types/wrappedI80F48.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrappedI80F48.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/wrappedI80F48.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,sCAAsC,CAAC;AAErF,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD,wBAAgB,0BAA0B,IAAI,UAAU,CACtD,iBAAiB,EACjB,aAAa,CACd,CAIA"}
+{"version":3,"file":"wrappedI80F48.d.ts","sourceRoot":"","sources":["../../../src/marginfi-sdk/types/wrappedI80F48.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD,wBAAgB,0BAA0B,IAAI,UAAU,CACtD,iBAAiB,EACjB,aAAa,CACd,CAIA"}

package/dist/marginfi-sdk/types/wrappedI80F48.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWrappedI80F48Serializer = getWrappedI80F48Serializer;
 const serializers_1 = require("@metaplex-foundation/umi/serializers");
 function getWrappedI80F48Serializer() {
-    return (0, serializers_1.struct)([['value', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 16 })]], {
-        description: 'WrappedI80F48',
+    return (0, serializers_1.struct)([["value", (0, serializers_1.array)((0, serializers_1.u8)(), { size: 16 })]], {
+        description: "WrappedI80F48",
     });
 }

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,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA2D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA2D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -189,15 +189,15 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(supplyUsage.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     const debtUsd = (0, numberUtils_1.fromBaseUnit)(debtUsage?.amountUsed?.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS);
     return {
-        liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, Math.round(liqThreshold * 10000)),
+        liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, (0, numberUtils_1.toBps)(liqThreshold)),
         netWorth: {
             baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, generalAccounts_1.USD_DECIMALS),
             baseUnit: (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supplyPrice, supplyUsage.decimals),
         },
         supply: supplyUsage,
         debt: debtUsage,
-        maxLtvBps: Math.round(maxLtv * 10000),
-        liqThresholdBps: Math.round(liqThreshold * 10000),
+        maxLtvBps: (0, numberUtils_1.toBps)(maxLtv),
+        liqThresholdBps: (0, numberUtils_1.toBps)(liqThreshold),
         lastUpdated: BigInt((0, generalUtils_1.currentUnixSeconds)()),
         padding1: [],
         padding2: [],

package/dist/utils/numberUtils.js

@@ -28,10 +28,10 @@ function fromBaseUnit(value, decimals) {
     return Number(value) / Math.pow(10, decimals);
 }
 function fromBps(value) {
-    return value / 10000;
+    return value / constants_1.BASIS_POINTS;
 }
 function toBps(value) {
-    return Math.round(value * 10000);
+    return Math.round(value * constants_1.BASIS_POINTS);
 }
 function bytesToI80F48(bytes) {
     if (bytes.length !== 16) {
@@ -107,5 +107,5 @@ function maxRepayFromBps(maxLtvBps, liqThresholdBps) {
     return Math.min(9000, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000, 0.005));
 }
 function maxRepayToBps(maxLtvBps, liqThresholdBps) {
-    return Math.min(maxRepayFromBps(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.005));
+    return Math.min(maxRepayFromBps(maxLtvBps, liqThresholdBps) - constants_1.MIN_REPAY_GAP_BPS, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.005));
 }

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -34,6 +34,7 @@ import {
 import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
 import { generateRandomU64 } from "../utils/generalUtils";
 import {
+  Bank,
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
@@ -43,7 +44,9 @@ import {
   lendingAccountStartFlashloan,
   lendingAccountWithdraw,
   marginfiAccountInitialize,
+  safeFetchAllBank,
   safeFetchAllMarginfiAccount,
+  safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
@@ -75,6 +78,9 @@ export class SolautoMarginfiClient extends SolautoClient {
   public marginfiSupplyAccounts!: MarginfiAssetAccounts;
   public marginfiDebtAccounts!: MarginfiAssetAccounts;
 
+  public supplyPriceOracle!: PublicKey;
+  public debtPriceOracle!: PublicKey;
+
   // For flash loans
   public intermediaryMarginfiAccountSigner?: Signer;
   public intermediaryMarginfiAccountPk!: PublicKey;
@@ -113,6 +119,17 @@ export class SolautoMarginfiClient extends SolautoClient {
       MARGINFI_ACCOUNTS[this.supplyMint.toString()]!;
     this.marginfiDebtAccounts = MARGINFI_ACCOUNTS[this.debtMint.toString()]!;
 
+    // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+    // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
+    //   publicKey(this.marginfiSupplyAccounts.bank),
+    //   publicKey(this.marginfiDebtAccounts.bank),
+    // ]);
+    // this.supplyPriceOracle = toWeb3JsPublicKey(supplyBank.config.oracleKeys[0]);
+    // this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
+
+    this.supplyPriceOracle = new PublicKey(this.marginfiSupplyAccounts.priceOracle);
+    this.debtPriceOracle = new PublicKey(this.marginfiDebtAccounts.priceOracle);
+
     if (!this.initialized) {
       await this.setIntermediaryMarginfiDetails();
     }
@@ -246,9 +263,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
+      supplyPriceOracle: publicKey(this.supplyPriceOracle),
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
+      debtPriceOracle: publicKey(this.debtPriceOracle),
       solautoPosition: publicKey(this.solautoPosition),
     });
   }
@@ -364,8 +381,8 @@ export class SolautoMarginfiClient extends SolautoClient {
     let supplyPriceOracle: UmiPublicKey | undefined = undefined;
     let debtPriceOracle: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-      supplyPriceOracle = publicKey(this.marginfiSupplyAccounts.priceOracle);
-      debtPriceOracle = publicKey(this.marginfiDebtAccounts.priceOracle);
+      supplyPriceOracle = publicKey(this.supplyPriceOracle);
+      debtPriceOracle = publicKey(this.debtPriceOracle);
     }
 
     return marginfiProtocolInteraction(this.umi, {
@@ -427,7 +444,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         )
       ),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
+      supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       signerSupplyTa: this.selfManaged
         ? publicKey(this.signerSupplyTa)
@@ -439,7 +456,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         ? publicKey(this.marginfiSupplyAccounts.vaultAuthority)
         : undefined,
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
+      debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
       vaultDebtTa: needDebtAccounts
@@ -485,20 +502,25 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
-    const bank = flashLoanDetails.mint.equals(this.supplyMint)
-      ? this.marginfiSupplyAccounts
-      : this.marginfiDebtAccounts;
+    const accounts = flashLoanDetails.mint.equals(this.supplyMint)
+      ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
+      : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
 
     const remainingAccounts: AccountMeta[] = [];
     let includedFlashLoanToken = false;
 
     if (this.intermediaryMarginfiAccount) {
-      this.intermediaryMarginfiAccount.lendingAccount.balances.forEach((x) => {
+      this.intermediaryMarginfiAccount.lendingAccount.balances.forEach(async (x) => {
         if (x.active) {
-          if (x.bankPk === bank.bank) {
+          if (x.bankPk === accounts.data.bank) {
             includedFlashLoanToken = true;
           }
 
+          // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
+          // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
+          // const priceOracle = bankData!.config.oracleKeys[0];
+          const priceOracle = publicKey(findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle);
+
           remainingAccounts.push(
             ...[
               {
@@ -507,9 +529,7 @@ export class SolautoMarginfiClient extends SolautoClient {
                 isWritable: false,
               },
               {
-                pubkey: publicKey(
-                  findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle
-                ),
+                pubkey: priceOracle,
                 isSigner: false,
                 isWritable: false,
               },
@@ -522,12 +542,12 @@ export class SolautoMarginfiClient extends SolautoClient {
       remainingAccounts.push(
         ...[
           {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(bank.bank)),
+            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.data.bank)),
             isSigner: false,
             isWritable: false,
           },
           {
-            pubkey: fromWeb3JsPublicKey(new PublicKey(bank.priceOracle)),
+            pubkey: fromWeb3JsPublicKey(new PublicKey(accounts.oracle)),
             isSigner: false,
             isWritable: false,
           },
@@ -540,8 +560,8 @@ export class SolautoMarginfiClient extends SolautoClient {
         lendingAccountRepay(this.umi, {
           amount: flashLoanDetails.baseUnitAmount,
           repayAll: null,
-          bank: publicKey(bank.bank),
-          bankLiquidityVault: publicKey(bank.liquidityVault),
+          bank: publicKey(accounts.data.bank),
+          bankLiquidityVault: publicKey(accounts.data.liquidityVault),
           marginfiAccount: publicKey(this.intermediaryMarginfiAccountPk),
           marginfiGroup: publicKey(DEFAULT_MARGINFI_GROUP),
           signer: this.signer,

package/src/constants/solautoConstants.ts

@@ -13,10 +13,12 @@ import {
 import { SOLAUTO_PROGRAM_ID } from "../generated";
 import { SOLAUTO_MANAGER } from "./generalAccounts";
 
-export const DEFAULT_RISK_AVERSION_BPS = 1500;
+export const BASIS_POINTS = 10000;
+
 export const DEFAULT_LIMIT_GAP_BPS = 1000;
 export const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
-export const MAX_REPAY_GAP_BPS = 100;
+export const MIN_REPAY_GAP_BPS = 100;
+export const MIN_BOOST_GAP_BPS = 50;
 
 // export const JITO_BLOCK_ENGINE = "ny.mainnet.block-engine.jito.wtf";
 // export const JITO_CONNECTION = new JitoRpcConnection(

package/src/generated/errors/solauto.ts

@@ -108,9 +108,9 @@ export class StaleProtocolDataError extends ProgramError {
 codeToErrorMap.set(0x5, StaleProtocolDataError);
 nameToErrorMap.set('StaleProtocolData', StaleProtocolDataError);
 
-/** UnableToReposition: Unable to adjust position to the desired utilization rate */
-export class UnableToRepositionError extends ProgramError {
-  override readonly name: string = 'UnableToReposition';
+/** UnableToRebalance: Unable to adjust position to the desired utilization rate */
+export class UnableToRebalanceError extends ProgramError {
+  override readonly name: string = 'UnableToRebalance';
 
   readonly code: number = 0x6; // 6
 
@@ -122,8 +122,8 @@ export class UnableToRepositionError extends ProgramError {
     );
   }
 }
-codeToErrorMap.set(0x6, UnableToRepositionError);
-nameToErrorMap.set('UnableToReposition', UnableToRepositionError);
+codeToErrorMap.set(0x6, UnableToRebalanceError);
+nameToErrorMap.set('UnableToRebalance', UnableToRebalanceError);
 
 /** ExceededValidUtilizationRate: Desired action brought the utilization rate to an unsafe amount */
 export class ExceededValidUtilizationRateError extends ProgramError {

package/src/marginfi-sdk/types/oracleSetup.ts

@@ -11,8 +11,9 @@ import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 export enum OracleSetup {
   None,
   PythLegacy,
-  SwitchboardV2,
+  SwitchboardLegacy,
   PythPushOracle,
+  SwitchboardPull,
 }
 
 export type OracleSetupArgs = OracleSetup;

package/src/marginfi-sdk/types/wrappedI80F48.ts

@@ -6,7 +6,12 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-import { Serializer, array, struct, u8 } from '@metaplex-foundation/umi/serializers';
+import {
+  Serializer,
+  array,
+  struct,
+  u8,
+} from "@metaplex-foundation/umi/serializers";
 
 export type WrappedI80F48 = { value: number[] };
 
@@ -16,7 +21,7 @@ export function getWrappedI80F48Serializer(): Serializer<
   WrappedI80F48Args,
   WrappedI80F48
 > {
-  return struct<WrappedI80F48>([['value', array(u8(), { size: 16 })]], {
-    description: 'WrappedI80F48',
+  return struct<WrappedI80F48>([["value", array(u8(), { size: 16 })]], {
+    description: "WrappedI80F48",
   }) as Serializer<WrappedI80F48Args, WrappedI80F48>;
 }

package/src/utils/marginfiUtils.ts

@@ -14,6 +14,7 @@ import {
   fromBaseUnit,
   getLiqUtilzationRateBps,
   toBaseUnit,
+  toBps,
 } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
 import { MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
@@ -353,7 +354,7 @@ export async function getMarginfiAccountPositionState(
     liqUtilizationRateBps: getLiqUtilzationRateBps(
       supplyUsd,
       debtUsd,
-      Math.round(liqThreshold * 10000)
+      toBps(liqThreshold)
     ),
     netWorth: {
       baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
@@ -364,8 +365,8 @@ export async function getMarginfiAccountPositionState(
     },
     supply: supplyUsage!,
     debt: debtUsage!,
-    maxLtvBps: Math.round(maxLtv * 10000),
-    liqThresholdBps: Math.round(liqThreshold * 10000),
+    maxLtvBps: toBps(maxLtv),
+    liqThresholdBps: toBps(liqThreshold),
     lastUpdated: BigInt(currentUnixSeconds()),
     padding1: [],
     padding2: [],

package/src/utils/numberUtils.ts

@@ -1,4 +1,4 @@
-import { MAX_REPAY_GAP_BPS } from "../constants";
+import { BASIS_POINTS, MIN_REPAY_GAP_BPS } from "../constants";
 import { FeeType } from "../generated";
 
 export function getLiqUtilzationRateBps(
@@ -22,11 +22,11 @@ export function fromBaseUnit(value: bigint, decimals: number): number {
 }
 
 export function fromBps(value: number): number {
-  return value / 10000;
+  return value / BASIS_POINTS;
 }
 
 export function toBps(value: number): number {
-  return Math.round(value * 10000);
+  return Math.round(value * BASIS_POINTS);
 }
 
 export function bytesToI80F48(bytes: number[]): number {
@@ -148,7 +148,7 @@ export function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number) {
 
 export function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
-    maxRepayFromBps(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
+    maxRepayFromBps(maxLtvBps, liqThresholdBps) - MIN_REPAY_GAP_BPS,
     getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, 0.005)
   );
 }

package/tests/transactions/solautoMarginfi.ts

@@ -20,8 +20,8 @@ import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
-  const signer = setupTest();
-  // const signer = setupTest("solauto-manager");
+  // const signer = setupTest();
+  const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const useJitoBundle = false;