@haven-fi/solauto-sdk 1.0.581 → 1.0.582

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;CA0BxE,CAAC"}
+{"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"}

package/dist/constants/switchboardConstants.js

@@ -33,22 +33,22 @@ exports.SWITCHBOARD_PRICE_FEED_IDS = {
     },
     [tokens.H_SOL]: {
         feedId: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
-        feedHash: "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367"
+        feedHash: "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367",
     },
     [tokens.POPCAT]: {
         feedId: "FTcFqwCjAgv2VMaowQ9XSBcesVzFzZkaju25nKio6bki",
-        feedHash: "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f"
+        feedHash: "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f",
     },
     [tokens.RETARDIO]: {
         feedId: "EvPXnpMoyrj4B6P55LDP2VpSLkTBWom2SqL4486ToNhM",
-        feedHash: "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b"
+        feedHash: "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b",
     },
     [tokens.BILLY]: {
         feedId: "uBe4er4VSMgYvBNwSbFctSShRXNPkCfaPh7zHMBFeBi",
-        feedHash: "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe"
+        feedHash: "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe",
     },
     [tokens.HMTR]: {
         feedId: "F2hKL67W4ZDe9k7ZrJKnp2LhWrgqg2JQTkJf2dgBggRD",
-        feedHash: "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5"
+        feedHash: "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5",
     },
 };

package/dist/utils/priceUtils.js

@@ -43,7 +43,7 @@ async function fetchTokenPrices(mints) {
         return mints.map((mint) => solautoConstants_1.PRICES[mint.toString()].price);
     }
     const pythMints = mints.filter((x) => x.toString() in pythConstants_1.PYTH_PRICE_FEED_IDS);
-    const switchboardMints = mints.filter((x) => x.toString() in switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS);
+    const switchboardMints = mints.filter((x) => x.toString() in Object.keys(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS));
     const otherMints = mints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
     const [pythData, switchboardData, jupData] = await Promise.all([
         (0, generalUtils_1.zip)(pythMints, await getPythPrices(pythMints)),

package/dist/utils/switchboardUtils.d.ts

@@ -1,7 +1,7 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import * as OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
 import { Signer } from "@metaplex-foundation/umi";
+import * as OnDemand from "@switchboard-xyz/on-demand";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): OnDemand.PullFeed;
 export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
 export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAOtE,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,CAsB5C;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"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAEtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,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,CAsB5C;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"}

package/dist/utils/switchboardUtils.js

@@ -32,11 +32,12 @@ exports.getSwitchboardFeedData = getSwitchboardFeedData;
 const anchor_1 = require("@coral-xyz/anchor");
 const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
 const web3_js_1 = require("@solana/web3.js");
-const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const generalUtils_1 = require("./generalUtils");
+const solanaUtils_1 = require("./solanaUtils");
 function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
@@ -50,15 +51,15 @@ 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 [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({}), 2, 200);
+    const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await feed.fetchUpdateIx({
+        chain: "solana",
+        network: "mainnet-beta",
+    }), 2, 200);
+    if (!pullIx) {
+        throw new Error("Unable to fetch SWB crank IX");
+    }
     return {
-        tx: (0, umi_1.transactionBuilder)(pullIxs.map((x) => {
-            return {
-                bytesCreatedOnChain: 0,
-                instruction: (0, umi_web3js_adapters_1.fromWeb3JsInstruction)(x),
-                signers: [signer],
-            };
-        })),
+        tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIx)]),
         lookupTableAddresses: responses
             .filter((x) => Boolean(x.oracle.lut?.key))
             .map((x) => x.oracle.lut.key.toString()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.581",
+  "version": "1.0.582",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -24,7 +24,7 @@
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.95.8",
     "@switchboard-xyz/common": "=3.0.12",
-    "@switchboard-xyz/on-demand": "=2.4.0",
+    "@switchboard-xyz/on-demand": "=1.2.51",
     "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",

package/src/constants/switchboardConstants.ts

@@ -14,22 +14,27 @@ export const SWITCHBOARD_PRICE_FEED_IDS: { [key: string]: SwitchboardFeed } = {
   },
   [tokens.H_SOL]: {
     feedId: "1snBjCaHejZqQsAqkELAKNaqUrDNNCr7zmNX6qaQCzg",
-    feedHash: "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367"
+    feedHash:
+      "0x59206aa3da593cd2312bde1930cf3368f6119a650229e147060be4fc2fcd1367",
   },
   [tokens.POPCAT]: {
     feedId: "FTcFqwCjAgv2VMaowQ9XSBcesVzFzZkaju25nKio6bki",
-    feedHash: "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f"
+    feedHash:
+      "0xeb4f9a43024f8f33786b7291404510af8e94a66e1acb44953a3137878ee7033f",
   },
   [tokens.RETARDIO]: {
     feedId: "EvPXnpMoyrj4B6P55LDP2VpSLkTBWom2SqL4486ToNhM",
-    feedHash: "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b"
+    feedHash:
+      "0x982d968a0608046986aec84d95ae884c4dc2140f0b3e14ed7b8161ada573d18b",
   },
   [tokens.BILLY]: {
     feedId: "uBe4er4VSMgYvBNwSbFctSShRXNPkCfaPh7zHMBFeBi",
-    feedHash: "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe"
+    feedHash:
+      "0xbbd0d393111ff1ad7cc1a2f15ce24b61d4d6b3e99e440aa77572bd7f1da9afbe",
   },
   [tokens.HMTR]: {
     feedId: "F2hKL67W4ZDe9k7ZrJKnp2LhWrgqg2JQTkJf2dgBggRD",
-    feedHash: "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5"
+    feedHash:
+      "0x61999c4f8a03208b5b5b50663323b1ef8d0acbb3642ec79053b33b5768605fb5",
   },
 };

package/src/utils/switchboardUtils.ts

@@ -6,15 +6,13 @@ import {
   Transaction,
   VersionedTransaction,
 } from "@solana/web3.js";
-import * as OnDemand from "@switchboard-xyz/on-demand";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
 import { TransactionItemInputs } from "../types";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
-import {
-  fromWeb3JsInstruction,
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
-import { retryWithExponentialBackoff, zip } from "./generalUtils";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import * as OnDemand from "@switchboard-xyz/on-demand";
+import { retryWithExponentialBackoff } from "./generalUtils";
+import { getWrappedInstruction } from "./solanaUtils";
 
 export function getPullFeed(
   conn: Connection,
@@ -50,22 +48,22 @@ export async function buildSwbSubmitResponseTx(
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
   const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
-  const [pullIxs, responses] = await retryWithExponentialBackoff(
-    async () => await feed.fetchUpdateIx({}),
+  const [pullIx, responses] = await retryWithExponentialBackoff(
+    async () =>
+      await feed.fetchUpdateIx({
+        chain: "solana",
+        network: "mainnet-beta",
+      }),
     2,
     200
   );
 
+  if (!pullIx) {
+    throw new Error("Unable to fetch SWB crank IX");
+  }
+
   return {
-    tx: transactionBuilder(
-      pullIxs!.map((x) => {
-        return {
-          bytesCreatedOnChain: 0,
-          instruction: fromWeb3JsInstruction(x),
-          signers: [signer],
-        };
-      })
-    ),
+    tx: transactionBuilder([getWrappedInstruction(signer, pullIx!)]),
     lookupTableAddresses: responses
       .filter((x) => Boolean(x.oracle.lut?.key))
       .map((x) => x.oracle.lut!.key.toString()),

package/tests/transactions/solautoMarginfi.ts

@@ -72,7 +72,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("5bFfSCsGUgEzYH8kwwRtFnWkKZ1by8uD8RHvKQPnQReB"),
+      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""