@haven-fi/solauto-sdk 1.0.3 → 1.0.5

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAIpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA4D7B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA+D7B"}

package/dist/utils/jupiterUtils.js

@@ -5,7 +5,6 @@ const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
 const solanaUtils_1 = require("./solanaUtils");
 const numberUtils_1 = require("./numberUtils");
-const console_1 = require("console");
 const api_1 = require("@jup-ag/api");
 const accountUtils_1 = require("./accountUtils");
 const jupApi = (0, api_1.createJupiterApiClient)();
@@ -47,7 +46,9 @@ async function getJupSwapTransaction(signer, swapDetails) {
             destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
         },
     });
-    (0, console_1.assert)(instructions.swapInstruction !== undefined);
+    if (!instructions.swapInstruction) {
+        throw new Error("No swap instruction was returned by Jupiter");
+    }
     return {
         jupQuote: quoteResponse,
         lookupTableAddresses: instructions.addressLookupTableAddresses,

package/dist/utils/solanaUtils.d.ts

@@ -1,8 +1,6 @@
 import { AddressLookupTableInput, Signer, TransactionBuilder, WrappedInstruction } from "@metaplex-foundation/umi";
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { SolautoClient } from "../clients/solautoClient";
-export declare function loadSecretKey(keypairPath: string): Uint8Array;
-export declare function getSecretKey(keypairFilename?: string): Uint8Array;
 export declare function currentUnixSecondsSolana(): Promise<number>;
 export declare function getWrappedInstruction(signer: Signer, ix: TransactionInstruction): WrappedInstruction;
 export declare function setComputeUnitLimitUmiIx(signer: Signer, maxComputeUnits: number): WrappedInstruction;

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAGL,SAAS,EAIT,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAQzD,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,cAGhD;AAED,wBAAgB,YAAY,CAAC,eAAe,GAAE,MAAa,GAAG,UAAU,CAIvE;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQhE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAiBD,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,kBAAkB,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoDjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAGL,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAQzD,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAQhE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAiBD,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,kBAAkB,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAqDjC"}

package/dist/utils/solanaUtils.js

@@ -3,10 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendSingleOptimizedTransaction = exports.getComputeUnitPriceEstimate = exports.assembleFinalTransaction = exports.getAdressLookupInputs = exports.splTokenTransferUmiIx = exports.closeTokenAccountUmiIx = exports.systemTransferUmiIx = exports.createAssociatedTokenAccountUmiIx = exports.setComputeUnitPriceUmiIx = exports.setComputeUnitLimitUmiIx = exports.getWrappedInstruction = exports.currentUnixSecondsSolana = exports.getSecretKey = exports.loadSecretKey = void 0;
-const fs_1 = __importDefault(require("fs"));
+exports.sendSingleOptimizedTransaction = exports.getComputeUnitPriceEstimate = exports.assembleFinalTransaction = exports.getAdressLookupInputs = exports.splTokenTransferUmiIx = exports.closeTokenAccountUmiIx = exports.systemTransferUmiIx = exports.createAssociatedTokenAccountUmiIx = exports.setComputeUnitPriceUmiIx = exports.setComputeUnitLimitUmiIx = exports.getWrappedInstruction = exports.currentUnixSecondsSolana = void 0;
 const bs58_1 = __importDefault(require("bs58"));
-const path_1 = __importDefault(require("path"));
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const web3_js_1 = require("@solana/web3.js");
@@ -15,15 +13,6 @@ const accountUtils_1 = require("./accountUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
 const generalUtils_1 = require("./generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
-function loadSecretKey(keypairPath) {
-    const secretKey = JSON.parse(fs_1.default.readFileSync(keypairPath, "utf8"));
-    return new Uint8Array(secretKey);
-}
-exports.loadSecretKey = loadSecretKey;
-function getSecretKey(keypairFilename = "id") {
-    return loadSecretKey(path_1.default.join(process.env.HOME, ".config", "solana", keypairFilename + ".json"));
-}
-exports.getSecretKey = getSecretKey;
 async function currentUnixSecondsSolana() {
     return await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const blockTime = await solautoConstants_1.CONNECTION.getBlockTime(await solautoConstants_1.CONNECTION.getSlot());
@@ -152,7 +141,6 @@ async function getComputeUnitPriceEstimate(tx, attemptNum) {
         },
     ]);
     const feeEstimate = Math.round(resp.priorityFeeEstimate);
-    console.log("Compute unit price: ", feeEstimate);
     return feeEstimate;
 }
 exports.getComputeUnitPriceEstimate = getComputeUnitPriceEstimate;
@@ -161,9 +149,10 @@ async function sendSingleOptimizedTransaction(client, tx, simulateOnly, attemptN
     client.log("Instructions: ", tx.getInstructions().length);
     client.log("Serialized transaction size: ", tx.getTransactionSize(solautoConstants_1.UMI));
     const feeEstimate = await getComputeUnitPriceEstimate(tx, attemptNum);
+    client.log("Compute unit price: ", feeEstimate);
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction((0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(client.signer, tx, feeEstimate, 1400000).setLatestBlockhash(solautoConstants_1.UMI)).buildAndSign(solautoConstants_1.UMI))));
     const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
-    console.log("Compute unit limit: ", computeUnitLimit);
+    client.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
         const result = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await assembleFinalTransaction(client.signer, tx, feeEstimate, computeUnitLimit).sendAndConfirm(solautoConstants_1.UMI, {
             send: {

package/package.json

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

package/src/utils/jupiterUtils.ts

@@ -6,7 +6,6 @@ import {
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { getWrappedInstruction } from "./solanaUtils";
 import { toBps } from "./numberUtils";
-import { assert } from "console";
 import {
   createJupiterApiClient,
   Instruction,
@@ -87,7 +86,10 @@ export async function getJupSwapTransaction(
     },
   });
 
-  assert(instructions.swapInstruction !== undefined);
+  if (!instructions.swapInstruction) {
+    throw new Error("No swap instruction was returned by Jupiter");
+  }
+
   return {
     jupQuote: quoteResponse,
     lookupTableAddresses: instructions.addressLookupTableAddresses,

package/src/utils/solanaUtils.ts

@@ -1,6 +1,4 @@
-import fs from "fs";
 import bs58 from "bs58";
-import path from "path";
 import {
   AddressLookupTableInput,
   Signer,
@@ -23,7 +21,6 @@ import {
   SystemProgram,
   TransactionInstruction,
   VersionedTransaction,
-  TransactionError,
 } from "@solana/web3.js";
 import {
   createAssociatedTokenAccountIdempotentInstruction,
@@ -39,17 +36,6 @@ import {
   getLendingAccountStartFlashloanInstructionDataSerializer,
 } from "../marginfi-sdk";
 
-export function loadSecretKey(keypairPath: string) {
-  const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
-  return new Uint8Array(secretKey);
-}
-
-export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
-  return loadSecretKey(
-    path.join(process.env.HOME!, ".config", "solana", keypairFilename + ".json")
-  );
-}
-
 export async function currentUnixSecondsSolana(): Promise<number> {
   return await retryWithExponentialBackoff(async () => {
     const blockTime = await CONNECTION.getBlockTime(await CONNECTION.getSlot());
@@ -268,7 +254,6 @@ export async function getComputeUnitPriceEstimate(
     },
   ]);
   const feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
-  console.log("Compute unit price: ", feeEstimate);
 
   return feeEstimate;
 }
@@ -284,6 +269,7 @@ export async function sendSingleOptimizedTransaction(
   client.log("Serialized transaction size: ", tx.getTransactionSize(UMI));
 
   const feeEstimate = await getComputeUnitPriceEstimate(tx, attemptNum);
+  client.log("Compute unit price: ", feeEstimate);
 
   const simulationResult = await retryWithExponentialBackoff(
     async () =>
@@ -304,7 +290,7 @@ export async function sendSingleOptimizedTransaction(
   const computeUnitLimit = Math.round(
     simulationResult.value.unitsConsumed! * 1.15
   );
-  console.log("Compute unit limit: ", computeUnitLimit);
+  client.log("Compute unit limit: ", computeUnitLimit);
 
   if (!simulateOnly) {
     const result = await retryWithExponentialBackoff(

package/tests/shared.ts

@@ -1,7 +1,19 @@
+import path from "path";
+import fs from "fs";
 import { Signer, createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { Connection, clusterApiUrl } from "@solana/web3.js";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
-import { getSecretKey } from "../src/utils/solanaUtils";
+
+export function loadSecretKey(keypairPath: string) {
+  const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
+  return new Uint8Array(secretKey);
+}
+
+export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
+  return loadSecretKey(
+    path.join(process.env.HOME!, ".config", "solana", keypairFilename + ".json")
+  );
+}
 
 export function setupTest(keypairFilename?: string): Signer {
   const umi = createUmi(