@haven-fi/solauto-sdk 1.0.295 → 1.0.297

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;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAMrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,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,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAkF7B"}
+{"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;AAMrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,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,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CA0F7B"}

package/dist/utils/jupiterUtils.js

@@ -33,7 +33,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
                 : undefined,
         slippageBps: 50,
         maxAccounts: !swapDetails.exactOut ? 60 : undefined,
-    }), 3);
+    }), 4, 200);
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));
@@ -44,7 +44,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
             Math.ceil(parseInt(quoteResponse.inAmount) * (0, numberUtils_1.fromBps)(finalPriceSlippageBps))).toString();
     }
     (0, generalUtils_1.consoleLog)("Getting jup instructions...");
-    const instructions = await jupApi.swapInstructionsPost({
+    const instructions = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.swapInstructionsPost({
         swapRequest: {
             userPublicKey: signer.publicKey.toString(),
             quoteResponse,
@@ -52,7 +52,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
             useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
             destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
         },
-    });
+    }), 4, 200);
     if (!instructions.swapInstruction) {
         throw new Error("No swap instruction was returned by Jupiter");
     }

package/dist/utils/solanaUtils.js

@@ -219,7 +219,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     if (txType !== "skip-simulation") {
         const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, await assembleFinalTransaction(umi.identity, tx, cuPrice, 1400000).setLatestBlockhash(umi)), 3);
         simulationResult.value.err;
-        computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
+        computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.2);
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", computeUnitLimit);
     }
     if (txType !== "only-simulate") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.295",
+  "version": "1.0.297",
   "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

@@ -69,7 +69,8 @@ export async function getJupSwapTransaction(
         slippageBps: 50,
         maxAccounts: !swapDetails.exactOut ? 60 : undefined,
       }),
-    3
+    4,
+    200
   );
 
   const priceImpactBps =
@@ -84,23 +85,30 @@ export async function getJupSwapTransaction(
   if (swapDetails.exactOut) {
     quoteResponse.inAmount = (
       parseInt(quoteResponse.inAmount) +
-      Math.ceil(parseInt(quoteResponse.inAmount) * fromBps(finalPriceSlippageBps))
+      Math.ceil(
+        parseInt(quoteResponse.inAmount) * fromBps(finalPriceSlippageBps)
+      )
     ).toString();
   }
 
   consoleLog("Getting jup instructions...");
-  const instructions = await jupApi.swapInstructionsPost({
-    swapRequest: {
-      userPublicKey: signer.publicKey.toString(),
-      quoteResponse,
-      wrapAndUnwrapSol: false,
-      useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
-      destinationTokenAccount: getTokenAccount(
-        swapDetails.destinationWallet,
-        swapDetails.outputMint
-      ).toString(),
-    },
-  });
+  const instructions = await retryWithExponentialBackoff(
+    async () =>
+      await jupApi.swapInstructionsPost({
+        swapRequest: {
+          userPublicKey: signer.publicKey.toString(),
+          quoteResponse,
+          wrapAndUnwrapSol: false,
+          useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
+          destinationTokenAccount: getTokenAccount(
+            swapDetails.destinationWallet,
+            swapDetails.outputMint
+          ).toString(),
+        },
+      }),
+    4,
+    200
+  );
 
   if (!instructions.swapInstruction) {
     throw new Error("No swap instruction was returned by Jupiter");

package/src/utils/solanaUtils.ts

@@ -400,7 +400,7 @@ export async function sendSingleOptimizedTransaction(
       3
     );
     simulationResult.value.err;
-    computeUnitLimit = Math.round(simulationResult.value.unitsConsumed! * 1.1);
+    computeUnitLimit = Math.round(simulationResult.value.unitsConsumed! * 1.2);
     consoleLog("Compute unit limit: ", computeUnitLimit);
   }
 

package/tests/transactions/solautoMarginfi.ts

@@ -54,8 +54,8 @@ describe("Solauto Marginfi tests", async () => {
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
       // ),
-      supplyMint: NATIVE_MINT,
-      debtMint: new PublicKey(USDC),
+      // supplyMint: NATIVE_MINT,
+      // debtMint: new PublicKey(USDC),
     });
 
     const transactionItems: TransactionItem[] = [];

package/tests/unit/accounts.ts

@@ -9,6 +9,9 @@ import {
 } from "../../src/utils/solanaUtils";
 import { publicKey } from "@metaplex-foundation/umi";
 import { assert } from "chai";
+import { getTokenAccount } from "../../src/utils";
+import { SOLAUTO_FEES_WALLET } from "../../src/constants";
+import { PublicKey } from "@solana/web3.js";
 
 describe("Assert Solauto fee token accounts are created", async () => {
   it("all Solauto fee token accounts created", async () => {
@@ -17,9 +20,12 @@ describe("Assert Solauto fee token accounts are created", async () => {
     );
 
     const tokenAccounts = await umi.rpc.getAccounts(
-      ALL_SUPPORTED_TOKENS.map((x) => publicKey(x))
+      ALL_SUPPORTED_TOKENS.map((x) =>
+        publicKey(getTokenAccount(SOLAUTO_FEES_WALLET, new PublicKey(x)))
+      )
     );
     for (let i = 0; i < tokenAccounts.length; i++) {
+      console.log(tokenAccounts[i].publicKey.toString());
       if (!tokenAccounts[i].exists) {
         console.log(
           "Missing Solauto fees TA for ",