@haven-fi/solauto-sdk 1.0.795 → 1.0.797

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;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"}
+{"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;YAwCnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}

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

@@ -29,6 +29,7 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
             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));
+                this.txHandler.log("Set crank IXs in TX");
                 txs.unshift(...oracleTxs);
             }
         }

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;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,8BAyBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAwC5C;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,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,8BA0BnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA0C5C;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

@@ -32,9 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
@@ -45,7 +42,6 @@ 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 switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
@@ -56,13 +52,15 @@ async function getPullFeed(conn, mint, wallet) {
         signAllTransactions: async (txs) => txs,
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
-    const program = new anchor_1.Program(switchboard_json_1.default, provider);
+    (0, generalUtils_1.consoleLog)("Pulling SWB program...");
     const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
     const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
+    (0, generalUtils_1.consoleLog)("Pulled SWB program!");
     return new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const feed = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    (0, generalUtils_1.consoleLog)("Fetching crank IX...");
     const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
             gateway: await feed.fetchGatewayUrl(),

package/local/txSandbox.ts

@@ -5,13 +5,17 @@ import {
   buildSwbSubmitResponseTx,
   ClientTransactionsManager,
   consoleLog,
+  deposit,
   getBatches,
   getClient,
+  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  JITO_SOL,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -19,7 +23,9 @@ import {
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
+  toBaseUnit,
   TransactionItem,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
 import { NATIVE_MINT } from "@solana/spl-token";
@@ -36,7 +42,7 @@ let [conn, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("id")))
 );
 
 export async function main() {
@@ -50,16 +56,25 @@ export async function main() {
 
   await client.initializeExistingSolautoPosition({
     positionId: 1,
-    authority: new PublicKey("R8Nnj1UqK1BRPnfJYj7MvfPUK3GmEzmgh1CwFFtUNsF"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
+    authority: new PublicKey("EvAzkzFa7bu4vWpgu8Wyng8LLeCNmteP8jDme5gWSQWL")
+    // supplyMint: NATIVE_MINT,
+    // debtMint: new PublicKey(USDC),
+    // lpPoolAccount: getMarginfiAccounts("Prod").defaultGroup,
   });
 
-  // const transactionItems = [rebalance(client)];
+  // const transactionItems = [
+  //   openSolautoPosition(client, {
+  //     boostToBps: 2000,
+  //     boostGap: 50,
+  //     repayToBps: 5000,
+  //     repayGap: 50,
+  //   }),
+  //   deposit(client, toBaseUnit(0.5, 9)),
+  //   rebalance(client),
+  // ];
   const transactionItems = [
     new TransactionItem(
-      async () => await buildSwbSubmitResponseTx(conn, signer, NATIVE_MINT)
+      async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JITO_SOL))
     ),
   ];
 

package/package.json

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

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

@@ -68,6 +68,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
               this.updateOracleTxName
             )
         );
+        this.txHandler.log("Set crank IXs in TX");
         txs.unshift(...oracleTxs);
       }
     }

package/src/utils/switchboardUtils.ts

@@ -13,6 +13,7 @@ import switchboardIdl from "../idls/switchboard.json";
 import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
 import { TransactionItemInputs } from "../types";
 import {
+  consoleLog,
   currentUnixSeconds,
   retryWithExponentialBackoff,
 } from "./generalUtils";
@@ -37,11 +38,12 @@ export async function getPullFeed(
     dummyWallet,
     AnchorProvider.defaultOptions()
   );
-  const program = new Program(switchboardIdl as Idl, provider);
 
+  consoleLog("Pulling SWB program...");
   const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
   const sbProgram = await Program.at(ON_DEMAND_MAINNET_PID, provider);
 
+  consoleLog("Pulled SWB program!");
   return new PullFeed(
     sbProgram,
     new PublicKey(SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)
@@ -54,6 +56,8 @@ export async function buildSwbSubmitResponseTx(
   mint: PublicKey
 ): Promise<TransactionItemInputs | undefined> {
   const feed = await getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
+
+  consoleLog("Fetching crank IX...");
   const [pullIxs, responses] = await retryWithExponentialBackoff(
     async () => {
       const res = await feed.fetchUpdateIx({