@haven-fi/solauto-sdk 1.0.473 → 1.0.475

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

@@ -11,7 +11,8 @@ export declare enum OracleSetup {
     PythLegacy = 1,
     SwitchboardLegacy = 2,
     PythPushOracle = 3,
-    SwitchboardPull = 4
+    SwitchboardPull = 4,
+    StakedWithPythPush = 5
 }
 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,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"}
+{"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;IACf,kBAAkB,IAAA;CACnB;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

@@ -17,6 +17,7 @@ var OracleSetup;
     OracleSetup[OracleSetup["SwitchboardLegacy"] = 2] = "SwitchboardLegacy";
     OracleSetup[OracleSetup["PythPushOracle"] = 3] = "PythPushOracle";
     OracleSetup[OracleSetup["SwitchboardPull"] = 4] = "SwitchboardPull";
+    OracleSetup[OracleSetup["StakedWithPythPush"] = 5] = "StakedWithPythPush";
 })(OracleSetup || (exports.OracleSetup = OracleSetup = {}));
 function getOracleSetupSerializer() {
     return (0, serializers_1.scalarEnum)(OracleSetup, {

package/dist/transactions/transactionUtils.js

@@ -487,7 +487,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
         (0, generalUtils_1.consoleLog)("Error instruction program:", errIx?.programId.toString());
         const solautoError = (0, generated_1.getSolautoErrorFromCode)(errCode ?? -1, (0, generated_1.createSolautoProgram)());
         const marginfiError = (0, marginfi_sdk_1.getMarginfiErrorFromCode)(errCode ?? -1, (0, marginfi_sdk_1.createMarginfiProgram)());
-        if (errCode &&
+        if (errCode !== undefined &&
             errIx?.programId.toString() ===
                 umi.programs.get("solauto").publicKey.toString()) {
             programError = solautoError ?? marginfiError;
@@ -497,11 +497,11 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
                 canBeIgnored = true;
             }
         }
-        else if (errCode && errIx?.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
+        else if (errCode !== undefined && errIx?.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
             programName = "Marginfi";
             programError = marginfiError;
         }
-        else if (errCode && errIx?.programId === jupiter_sdk_1.JUPITER_PROGRAM_ID) {
+        else if (errCode !== undefined && errIx?.programId === jupiter_sdk_1.JUPITER_PROGRAM_ID) {
             programName = "Jupiter";
             programError = (0, jupiter_sdk_1.getJupiterErrorFromCode)(errCode, (0, jupiter_sdk_1.createJupiterProgram)());
         }
@@ -518,8 +518,8 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
         (0, generalUtils_1.consoleLog)(e);
     }
     const errData = {
-        errorName: errorName,
-        errorInfo: errorInfo,
+        errorName,
+        errorInfo,
         canBeIgnored,
     };
     (0, generalUtils_1.consoleLog)(errData);

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,EAGhB,MAAM,iBAAiB,CAAC;AAazB,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,CAmEA;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,CA8LA;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;AAazB,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,CAmEA;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,CAgMA;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

@@ -237,7 +237,9 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
     if (supplyMint === undefined ||
         debtMint === undefined ||
         (!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
-        (supplyMint.isStableCoin && debtMint.isStableCoin)) {
+        (supplyMint.isStableCoin && debtMint.isStableCoin) ||
+        supplyBank.config.oracleSetup === marginfi_sdk_1.OracleSetup.StakedWithPythPush ||
+        debtBank.config.oracleSetup === marginfi_sdk_1.OracleSetup.StakedWithPythPush) {
         return undefined;
     }
     if (!debtUsage) {

package/local/logPositions.ts

@@ -15,12 +15,14 @@ import {
   SOLAUTO_PROD_PROGRAM,
   TOKEN_INFO,
   USD_DECIMALS,
+  WBTC,
+  WETH,
 } from "../src";
 import { PublicKey } from "@solana/web3.js";
-import { NATIVE_MINT } from "@solana/spl-token";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
+import { NATIVE_MINT } from "@solana/spl-token";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -36,7 +38,13 @@ export function tokenInfo(mint?: PublicKey) {
   return TOKEN_INFO[mint ? mint.toString() : PublicKey.default.toString()];
 }
 
-type StrategyType = "Long" | "Short";
+type StrategyType = "Long" | "Ratio" | "Short";
+
+const MAJORS_PRIO = {
+  [WBTC.toString()]: 0,
+  [WETH.toString()]: 1,
+  [NATIVE_MINT.toString()]: 2,
+};
 
 function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey) {
   const supplyInfo = tokenInfo(supplyMint);
@@ -47,11 +55,18 @@ function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey) {
   );
 
   if (strat === "Long") {
-    return debtInfo.isStableCoin
-      ? `${supplyInfo.ticker} Long`
-      : supplyInfo.ticker
-        ? `${supplyInfo.ticker}/${debtInfo.ticker} Long`
-        : "";
+    return `${supplyInfo.ticker} Long`;
+  } else if (strat === "Ratio") {
+    if (
+      (supplyInfo.isLST && debtMint?.equals(NATIVE_MINT)) ||
+      (supplyMint &&
+        debtMint &&
+        MAJORS_PRIO[supplyMint!.toString()] > MAJORS_PRIO[debtMint!.toString()])
+    ) {
+      return `${supplyInfo.ticker}/${debtInfo.ticker} Long`;
+    } else {
+      return `${debtInfo.ticker}/${supplyInfo.ticker} Short`;
+    }
   } else {
     return `${debtInfo.ticker} Short`;
   }
@@ -64,15 +79,12 @@ function strategyType(
   const supplyInfo = tokenInfo(supplyMint);
   const debtInfo = tokenInfo(debtMint);
 
-  if (supplyInfo.isLST && debtMint.equals(NATIVE_MINT)) {
-    // Yield
-    throw new Error("Not yet supported");
+  if (!supplyInfo.isStableCoin && !debtInfo.isStableCoin) {
+    return "Ratio";
   } else if (debtInfo.isStableCoin) {
     return "Long";
-  } else if (supplyInfo.isStableCoin) {
-    return "Short";
   } else {
-    return "Long";
+    return "Short";
   }
 }
 

package/package.json

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

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

@@ -14,6 +14,7 @@ export enum OracleSetup {
   SwitchboardLegacy,
   PythPushOracle,
   SwitchboardPull,
+  StakedWithPythPush,
 }
 
 export type OracleSetupArgs = OracleSetup;

package/src/transactions/transactionUtils.ts

@@ -903,7 +903,7 @@ export function getErrorInfo(
     );
 
     if (
-      errCode &&
+      errCode !== undefined &&
       errIx?.programId.toString() ===
         umi.programs.get("solauto").publicKey.toString()
     ) {
@@ -915,10 +915,10 @@ export function getErrorInfo(
       ) {
         canBeIgnored = true;
       }
-    } else if (errCode && errIx?.programId === MARGINFI_PROGRAM_ID) {
+    } else if (errCode !== undefined && errIx?.programId === MARGINFI_PROGRAM_ID) {
       programName = "Marginfi";
       programError = marginfiError;
-    } else if (errCode && errIx?.programId === JUPITER_PROGRAM_ID) {
+    } else if (errCode !== undefined && errIx?.programId === JUPITER_PROGRAM_ID) {
       programName = "Jupiter";
       programError = getJupiterErrorFromCode(errCode, createJupiterProgram());
     }
@@ -935,11 +935,11 @@ export function getErrorInfo(
   }
 
   const errData = {
-    errorName: errorName,
-    errorInfo: errorInfo,
+    errorName,
+    errorInfo,
     canBeIgnored,
   };
-
   consoleLog(errData);
+
   return errData;
 }

package/src/utils/marginfiUtils.ts

@@ -6,6 +6,7 @@ import {
   getMarginfiAccountSize,
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
+  OracleSetup,
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
@@ -435,7 +436,9 @@ export async function getMarginfiAccountPositionState(
     supplyMint === undefined ||
     debtMint === undefined ||
     (!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
-    (supplyMint.isStableCoin && debtMint.isStableCoin)
+    (supplyMint.isStableCoin && debtMint.isStableCoin) ||
+    supplyBank.config.oracleSetup === OracleSetup.StakedWithPythPush ||
+    debtBank.config.oracleSetup === OracleSetup.StakedWithPythPush
   ) {
     return undefined;
   }