@haven-fi/solauto-sdk 1.0.788 → 1.0.791

package/dist/constants/pythConstants.d.ts

@@ -1,27 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 export declare const PYTH_PUSH_PROGRAM: PublicKey;
-export declare const PYTH_SPONSORED_SHARD_ID = 0;
-export declare const MARGINFI_SPONSORED_SHARD_ID = 3301;
-export declare const PYTH_PRICE_FEED_IDS: {
-    [x: string]: string;
-    bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1: string;
-    mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So: string;
-    J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn: string;
-    LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp: string;
-    "5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm": string;
-    JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN: string;
-    jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL: string;
-    "27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4": string;
-    "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh": string;
-    "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs": string;
-    hntyVP6YFm1Hg25TN9WGLqM12b8TQmcknKrdu1oxWux: string;
-    HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3: string;
-    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: string;
-    Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB: string;
-    DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263: string;
-    EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm: string;
-    pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn: string;
-};
+export declare const PYTH_PRICE_FEED_IDS: Record<string, string>;
 export declare const PYTH_ORACLE_ACCOUNTS: {
     pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn: string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAE7B,CAAC;AAEF,eAAO,MAAM,uBAAuB,IAAI,CAAC;AACzC,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAGhD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;CAqC/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;CAEhC,CAAC"}
+{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAE7B,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA6BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;CAEhC,CAAC"}

package/dist/constants/pythConstants.js

@@ -33,23 +33,16 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PYTH_ORACLE_ACCOUNTS = exports.PYTH_PRICE_FEED_IDS = exports.MARGINFI_SPONSORED_SHARD_ID = exports.PYTH_SPONSORED_SHARD_ID = exports.PYTH_PUSH_PROGRAM = void 0;
-const spl_token_1 = require("@solana/spl-token");
+exports.PYTH_ORACLE_ACCOUNTS = exports.PYTH_PRICE_FEED_IDS = exports.PYTH_PUSH_PROGRAM = void 0;
 const tokens = __importStar(require("./tokenConstants"));
 const web3_js_1 = require("@solana/web3.js");
 exports.PYTH_PUSH_PROGRAM = new web3_js_1.PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");
-exports.PYTH_SPONSORED_SHARD_ID = 0;
-exports.MARGINFI_SPONSORED_SHARD_ID = 3301;
 // https://pyth.network/developers/price-feed-ids#solana-stable
 exports.PYTH_PRICE_FEED_IDS = {
-    [spl_token_1.NATIVE_MINT.toString()]: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
     [tokens.B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
     [tokens.M_SOL]: "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
-    [tokens.JITO_SOL]: "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
-    [tokens.LST]: "0x12fb674ee496045b1d9cf7d5e65379acb026133c2ad69f3ed996fb9fe68e3a37",
     [tokens.INF]: "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
     [tokens.JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
-    [tokens.JTO]: "0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2",
     [tokens.JLP]: "0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a",
     [tokens.WBTC]: "0xc9d8b075a5c69303365ae23633d4e085199bf5c520a3b90fed1322a0342ffc33",
     [tokens.WETH]: "0x9d4294bbcd1174d6f2003ec365831e64cc31d9f6f15a2b85399db8d5000960f6",

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardConstants.d.ts","sourceRoot":"","sources":["../../src/constants/switchboardConstants.ts"],"names":[],"mappings":"AAEA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAGD,eAAO,MAAM,0BAA0B,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CA+BxE,CAAC"}
+{"version":3,"file":"switchboardConstants.d.ts","sourceRoot":"","sources":["../../src/constants/switchboardConstants.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAGD,eAAO,MAAM,0BAA0B,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CA+CxE,CAAC"}

package/dist/constants/switchboardConstants.js

@@ -34,13 +34,30 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SWITCHBOARD_PRICE_FEED_IDS = void 0;
+const spl_token_1 = require("@solana/spl-token");
 const tokens = __importStar(require("./tokenConstants"));
 // https://beta.ondemand.switchboard.xyz/solana/mainnet
 exports.SWITCHBOARD_PRICE_FEED_IDS = {
+    [spl_token_1.NATIVE_MINT.toString()]: {
+        feedId: "4Hmd6PdjVA9auCoScE12iaBogfwS4ZXQ6VZoBeqanwWW",
+        feedHash: "0x1f42dfb21efb24828b99fbe70e6d139cd665aafcbb1706bccd8f2a9b12562db6",
+    },
     [tokens.JUP_SOL]: {
         feedId: "HX5WM3qzogAfRCjBUWwnniLByMfFrjm1b5yo4KoWGR27",
         feedHash: "0xc02f22d47b20b43bafde474328ac027283dbd7bb443660f5ec414c93faec56dc",
     },
+    [tokens.JITO_SOL]: {
+        feedId: "5htZ4vPKPjAEg8EJv6JHcaCetMM4XehZo8znQvrp6Ur3",
+        feedHash: "0x44f5a7676baf4c6e5eb26fdde2695e7e3e0971071b76ddc622fa71528092ca25"
+    },
+    [tokens.LST]: {
+        feedId: "BWK8Wnybb7rPteNMqJs9uWoqdfYApNym6WgE59BwLe1v",
+        feedHash: "0x74e140c452fe29cced80898a51961ed1410c1fe0efbdc970fe5aac986427419e"
+    },
+    [tokens.JTO]: {
+        feedId: "A9RnpLxxtAS2TR3HtSMNJfsKpRPvkLbBkGZ6gKziSPLr",
+        feedHash: "0xa5bc3b659791facc5edfd8e74942c79d7e8d59f0f913dcdd9bcfb33a2fceb575"
+    },
     [tokens.H_SOL]: {
         feedId: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
         feedHash: "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367",

package/dist/services/transactions/manager/clientTransactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAM5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YA4BnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAkClD"}
+{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAO5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YAuCnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}

package/dist/services/transactions/manager/clientTransactionsManager.js

@@ -24,9 +24,13 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
                 : []),
         ];
         if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
-            this.txHandler.log("Requires oracle update(s)...");
-            const oracleTxs = switchboardMints.map((x) => new types_1.TransactionItem(async () => await (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
-            txs.unshift(...oracleTxs);
+            this.txHandler.log("Checking if oracle update(s) needed...");
+            const staleOracles = (await (0, utils_1.getSwitchboardFeedData)(this.txHandler.connection, switchboardMints)).filter((x) => x.stale).length > 0;
+            if (staleOracles) {
+                this.txHandler.log("Requires oracle update(s)...");
+                const oracleTxs = switchboardMints.map((x) => new types_1.TransactionItem(async () => await (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
+                txs.unshift(...oracleTxs);
+            }
         }
     }
     async addChoreTxs(txs, updateLutTx) {

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,EAEL,uBAAuB,EACxB,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,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/dist/utils/pythUtils.d.ts

@@ -1,5 +1,4 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 export declare function getMostUpToDatePythOracle(umi: Umi, oracleKeys: PublicKey[]): Promise<PublicKey>;
-export declare function getPythPushOracleAddress(feedId: PublicKey, shardId: number, programId?: PublicKey): PublicKey;
 //# sourceMappingURL=pythUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pythUtils.d.ts","sourceRoot":"","sources":["../../src/utils/pythUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK1D,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,sBAgBxB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,SAA6B,GACvC,SAAS,CAMX"}
+{"version":3,"file":"pythUtils.d.ts","sourceRoot":"","sources":["../../src/utils/pythUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK1D,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,sBAgBxB"}

package/dist/utils/pythUtils.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMostUpToDatePythOracle = getMostUpToDatePythOracle;
-exports.getPythPushOracleAddress = getPythPushOracleAddress;
-const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
-const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const pyth_1 = require("../externalSdks/pyth");
 async function getMostUpToDatePythOracle(umi, oracleKeys) {
@@ -12,7 +9,3 @@ async function getMostUpToDatePythOracle(umi, oracleKeys) {
         Number(a[1]?.priceMessage.publishTime ?? 0));
     return oracles[0][0];
 }
-function getPythPushOracleAddress(feedId, shardId, programId = constants_1.PYTH_PUSH_PROGRAM) {
-    const shardBytes = (0, generalUtils_1.u16ToArrayBufferLE)(shardId);
-    return web3_js_1.PublicKey.findProgramAddressSync([shardBytes, feedId.toBuffer()], programId)[0];
-}

package/local/txSandbox.ts

@@ -48,7 +48,7 @@ export async function main() {
 
   await client.initializeExistingSolautoPosition({
     positionId: 1,
-    authority: new PublicKey("7rujyCAvZYsd3kmfhEN6YmsRLpobtzsqrsZAKv5Mgkob"),
+    authority: new PublicKey("6K8FQ4W8SV2DGs73aQ5zybgfgSCGswybWbGXnw9JjoJR"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),

package/package.json

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

package/src/constants/pythConstants.ts

@@ -6,27 +6,16 @@ export const PYTH_PUSH_PROGRAM = new PublicKey(
   "pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT"
 );
 
-export const PYTH_SPONSORED_SHARD_ID = 0;
-export const MARGINFI_SPONSORED_SHARD_ID = 3301;
-
 // https://pyth.network/developers/price-feed-ids#solana-stable
-export const PYTH_PRICE_FEED_IDS = {
-  [NATIVE_MINT.toString()]:
-    "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
+export const PYTH_PRICE_FEED_IDS: Record<string, string> = {
   [tokens.B_SOL]:
     "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
   [tokens.M_SOL]:
     "0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4",
-  [tokens.JITO_SOL]:
-    "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
-  [tokens.LST]:
-    "0x12fb674ee496045b1d9cf7d5e65379acb026133c2ad69f3ed996fb9fe68e3a37",
   [tokens.INF]:
     "0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f",
   [tokens.JUP]:
     "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
-  [tokens.JTO]:
-    "0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2",
   [tokens.JLP]:
     "0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a",
   [tokens.WBTC]:

package/src/constants/switchboardConstants.ts

@@ -1,3 +1,4 @@
+import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 
 interface SwitchboardFeed {
@@ -7,11 +8,27 @@ interface SwitchboardFeed {
 
 // https://beta.ondemand.switchboard.xyz/solana/mainnet
 export const SWITCHBOARD_PRICE_FEED_IDS: { [key: string]: SwitchboardFeed } = {
+  [NATIVE_MINT.toString()]: {
+    feedId: "4Hmd6PdjVA9auCoScE12iaBogfwS4ZXQ6VZoBeqanwWW",
+    feedHash: "0x1f42dfb21efb24828b99fbe70e6d139cd665aafcbb1706bccd8f2a9b12562db6",
+  },
   [tokens.JUP_SOL]: {
     feedId: "HX5WM3qzogAfRCjBUWwnniLByMfFrjm1b5yo4KoWGR27",
     feedHash:
       "0xc02f22d47b20b43bafde474328ac027283dbd7bb443660f5ec414c93faec56dc",
   },
+  [tokens.JITO_SOL]: {
+    feedId: "5htZ4vPKPjAEg8EJv6JHcaCetMM4XehZo8znQvrp6Ur3",
+    feedHash: "0x44f5a7676baf4c6e5eb26fdde2695e7e3e0971071b76ddc622fa71528092ca25"
+  },
+  [tokens.LST]: {
+    feedId: "BWK8Wnybb7rPteNMqJs9uWoqdfYApNym6WgE59BwLe1v",
+    feedHash: "0x74e140c452fe29cced80898a51961ed1410c1fe0efbdc970fe5aac986427419e"
+  },
+  [tokens.JTO]: {
+    feedId: "A9RnpLxxtAS2TR3HtSMNJfsKpRPvkLbBkGZ6gKziSPLr",
+    feedHash: "0xa5bc3b659791facc5edfd8e74942c79d7e8d59f0f913dcdd9bcfb33a2fceb575"
+  },
   [tokens.H_SOL]: {
     feedId: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
     feedHash:

package/src/services/transactions/manager/clientTransactionsManager.ts

@@ -6,6 +6,7 @@ import { SolautoClient } from "../../solauto";
 import { TransactionsManager } from "./transactionsManager";
 import {
   buildSwbSubmitResponseTx,
+  getSwitchboardFeedData,
   isSwitchboardMint,
   retryWithExponentialBackoff,
 } from "../../../utils";
@@ -44,20 +45,31 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     ];
 
     if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
-      this.txHandler.log("Requires oracle update(s)...");
-      const oracleTxs = switchboardMints.map(
-        (x) =>
-          new TransactionItem(
-            async () =>
-              await buildSwbSubmitResponseTx(
-                this.txHandler.connection,
-                this.txHandler.signer,
-                x
-              ),
-            this.updateOracleTxName
+        this.txHandler.log("Checking if oracle update(s) needed...");
+      const staleOracles =
+        (
+          await getSwitchboardFeedData(
+            this.txHandler.connection,
+            switchboardMints
           )
-      );
-      txs.unshift(...oracleTxs);
+        ).filter((x) => x.stale).length > 0;
+
+      if (staleOracles) {
+        this.txHandler.log("Requires oracle update(s)...");
+        const oracleTxs = switchboardMints.map(
+          (x) =>
+            new TransactionItem(
+              async () =>
+                await buildSwbSubmitResponseTx(
+                  this.txHandler.connection,
+                  this.txHandler.signer,
+                  x
+                ),
+              this.updateOracleTxName
+            )
+        );
+        txs.unshift(...oracleTxs);
+      }
     }
   }
 
@@ -111,7 +123,8 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
 
     const updateLut = await client.updateLookupTable();
 
-    const updateLutInSepTx = updateLut?.new || (updateLut?.accountsToAdd ?? []).length > 4;
+    const updateLutInSepTx =
+      updateLut?.new || (updateLut?.accountsToAdd ?? []).length > 4;
     if (updateLut && updateLutInSepTx) {
       await this.updateLut(updateLut.tx, updateLut.new);
     }

package/src/utils/marginfi/general.ts

@@ -7,9 +7,7 @@ import {
 import { ProgramEnv, MarginfiAssetAccounts } from "../../types";
 import {
   getMarginfiAccounts,
-  MARGINFI_SPONSORED_SHARD_ID,
   MarginfiBankAccountsMap,
-  PYTH_SPONSORED_SHARD_ID,
 } from "../../constants";
 import {
   Balance,
@@ -25,9 +23,9 @@ import { bytesToI80F48, fromBaseUnit, toBps } from "../numberUtils";
 import { getTokenAccountData } from "../accountUtils";
 import {
   getMostUpToDatePythOracle,
-  getPythPushOracleAddress,
 } from "../pythUtils";
 import { getAccountMeta } from "../solanaUtils";
+import { validPubkey } from "../generalUtils";
 
 export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
   return {
@@ -69,7 +67,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 +116,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]);
 

package/src/utils/pythUtils.ts

@@ -23,15 +23,3 @@ export async function getMostUpToDatePythOracle(
 
   return oracles[0][0];
 }
-
-export function getPythPushOracleAddress(
-  feedId: PublicKey,
-  shardId: number,
-  programId: PublicKey = PYTH_PUSH_PROGRAM
-): PublicKey {
-  const shardBytes = u16ToArrayBufferLE(shardId);
-  return PublicKey.findProgramAddressSync(
-    [shardBytes, feedId.toBuffer()],
-    programId
-  )[0];
-}