@haven-fi/solauto-sdk 1.0.788 → 1.0.789

package/dist/utils/marginfi/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA0BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAetC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAW3E"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AAUrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA8BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAiBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAW3E"}

package/dist/utils/marginfi/general.js

@@ -19,6 +19,7 @@ const numberUtils_1 = require("../numberUtils");
 const accountUtils_1 = require("../accountUtils");
 const pythUtils_1 = require("../pythUtils");
 const solanaUtils_1 = require("../solanaUtils");
+const generalUtils_1 = require("../generalUtils");
 function createDynamicMarginfiProgram(env) {
     return {
         name: "marginfi",
@@ -45,7 +46,9 @@ async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
     const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
     const banksData = await (0, marginfi_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
     const oracles = banksData
-        .map((bank) => bank.config.oracleKeys.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x)))
+        .map((bank) => bank.config.oracleKeys
+        .map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x))
+        .filter((x) => (0, generalUtils_1.validPubkey)(x)))
         .flat()
         .map((x) => x.toString());
     const otherAccounts = Object.entries(bankAccountsMap).flatMap(([groupName, tokenMap]) => Object.values(tokenMap).flatMap((accounts) => [
@@ -75,7 +78,9 @@ async function getMarginfiPriceOracle(umi, bank) {
         bank.data = await (0, marginfi_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
     }
     const priceOracle = bank.data.config.oracleSetup === marginfi_1.OracleSetup.PythPushOracle
-        ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, bank.data.config.oracleKeys.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x)))
+        ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, bank.data.config.oracleKeys
+            .map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x))
+            .filter((x) => (0, generalUtils_1.validPubkey)(x)))
         : (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
     return priceOracle;
 }

package/package.json

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

package/src/utils/marginfi/general.ts

@@ -28,6 +28,7 @@ import {
   getPythPushOracleAddress,
 } from "../pythUtils";
 import { getAccountMeta } from "../solanaUtils";
+import { validPubkey } from "../generalUtils";
 
 export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
   return {
@@ -69,7 +70,11 @@ export async function getAllBankRelatedAccounts(
   );
 
   const oracles = banksData
-    .map((bank) => bank.config.oracleKeys.map((x) => toWeb3JsPublicKey(x)))
+    .map((bank) =>
+      bank.config.oracleKeys
+        .map((x) => toWeb3JsPublicKey(x))
+        .filter((x) => validPubkey(x))
+    )
     .flat()
     .map((x) => x.toString());
 
@@ -114,7 +119,9 @@ export async function getMarginfiPriceOracle(
     bank.data.config.oracleSetup === OracleSetup.PythPushOracle
       ? await getMostUpToDatePythOracle(
           umi,
-          bank.data.config.oracleKeys.map((x) => toWeb3JsPublicKey(x))
+          bank.data.config.oracleKeys
+            .map((x) => toWeb3JsPublicKey(x))
+            .filter((x) => validPubkey(x))
         )
       : toWeb3JsPublicKey(bank.data.config.oracleKeys[0]);