@haven-fi/solauto-sdk 1.0.805 → 1.0.807

package/dist/utils/switchboardUtils.d.ts

@@ -1,10 +1,10 @@
 import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer } from "@metaplex-foundation/umi";
-import * as OnDemand from "@switchboard-xyz/on-demand";
+import { PullFeed } from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
-    gateway: OnDemand.Gateway;
-    feed: OnDemand.PullFeed;
+    gateway: import("@switchboard-xyz/on-demand").Gateway;
+    feed: 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":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAmD5C;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;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,EACL,QAAQ,EAGT,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAiCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAmD5C;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;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}

package/dist/utils/switchboardUtils.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
@@ -41,7 +8,7 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const anchor_1 = require("@coral-xyz/anchor");
-const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
+const on_demand_1 = require("@switchboard-xyz/on-demand");
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
@@ -54,16 +21,15 @@ async function getPullFeed(conn, mint, wallet) {
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
     (0, generalUtils_1.consoleLog)("Pulling SWB program...");
-    const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
-    const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
+    const sbProgram = await anchor_1.Program.at(on_demand_1.ON_DEMAND_MAINNET_PID, provider);
     const crossbar = new common_1.CrossbarClient("https://integrator-crossbar.mrgn.app/");
-    const queue = await Queue.loadDefault(sbProgram);
+    const queue = await on_demand_1.Queue.loadDefault(sbProgram);
     const gateway = await queue.fetchGatewayFromCrossbar(crossbar);
     (0, generalUtils_1.consoleLog)("Pulled SWB program!");
     (0, generalUtils_1.consoleLog)("Feed id:", constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
     return {
         gateway,
-        feed: new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)),
+        feed: new on_demand_1.PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)),
     };
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
@@ -100,7 +66,7 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
         lookupTableAddresses: responses
             .filter((x) => Boolean(x.oracle.lut?.key))
             .map((x) => x.oracle.lut.key.toString()),
-        orderPrio: -1,
+        orderPrio: -2,
     };
 }
 async function getSwitchboardFeedData(conn, mints) {

package/local/txSandbox.ts

@@ -32,7 +32,7 @@ import {
 import { getSecretKey } from "./shared";
 import { NATIVE_MINT } from "@solana/spl-token";
 
-const payForTransaction = true;
+const payForTransaction = false;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
@@ -64,17 +64,17 @@ export async function main() {
     // lpPoolAccount: getMarginfiAccounts("Prod").defaultGroup,
   });
 
-  // const transactionItems = [
-  //   rebalance(client, 3000),
-  // ];
   const transactionItems = [
-    new TransactionItem(
-      async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(NATIVE_MINT)),
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JUP_SOL)),
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JITO_SOL))
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(H_SOL))
-    ),
+    rebalance(client, 3000),
   ];
+  // const transactionItems = [
+  //   new TransactionItem(
+  //     async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(NATIVE_MINT)),
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JUP_SOL)),
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JITO_SOL))
+  //     // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(H_SOL))
+  //   ),
+  // ];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

package/src/utils/switchboardUtils.ts

@@ -6,8 +6,12 @@ import {
 } from "@solana/web3.js";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
-import * as OnDemand from "@switchboard-xyz/on-demand";
+import { AnchorProvider, Program } from "@coral-xyz/anchor";
+import {
+  PullFeed,
+  Queue,
+  ON_DEMAND_MAINNET_PID,
+} from "@switchboard-xyz/on-demand";
 import Big from "big.js";
 import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
 import { TransactionItemInputs } from "../types";
@@ -40,7 +44,6 @@ export async function getPullFeed(
   );
 
   consoleLog("Pulling SWB program...");
-  const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
   const sbProgram = await Program.at(ON_DEMAND_MAINNET_PID, provider);
 
   const crossbar = new CrossbarClient("https://integrator-crossbar.mrgn.app/");
@@ -111,7 +114,7 @@ export async function buildSwbSubmitResponseTx(
     lookupTableAddresses: responses
       .filter((x) => Boolean(x.oracle.lut?.key))
       .map((x) => x.oracle.lut!.key.toString()),
-    orderPrio: -1,
+    orderPrio: -2,
   };
 }