@haven-fi/solauto-sdk 1.0.716 → 1.0.718

package/dist/services/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EAAE,qBAAqB,EAAyB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA0L/F,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO,EAC9B,kBAAkB,CAAC,EAAE,kBAAkB;;;;EAuHxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAErE"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EACL,qBAAqB,EAErB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAkMrB,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO,EAC9B,kBAAkB,CAAC,EAAE,kBAAkB;;;;EAuHxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAKrE"}

package/dist/services/transactions/transactionUtils.js

@@ -102,16 +102,20 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         const tokenAccount = (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
             ? client.signerSupplyTa
             : client.signerDebtTa;
+        console.log("withdraw", (0, generated_1.isSolautoAction)("Withdraw", solautoAction));
+        console.log(tokenAccount);
+        console.log("already getting created", accountsGettingCreated.includes(tokenAccount.toString()));
         if (accountsGettingCreated.includes(tokenAccount.toString())) {
             continue;
         }
-        if (!(0, utils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
+        if (!(await (0, utils_1.getSolanaAccountCreated)(client.umi, tokenAccount))) {
             chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
                 ? client.pos.supplyMint
                 : client.pos.debtMint));
             accountsGettingCreated.push(tokenAccount.toString());
         }
     }
+    console.log(chores.getInstructions().length);
     return chores;
 }
 async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
@@ -427,5 +431,6 @@ function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting)
     return errData;
 }
 function usePriorityFee(priorityFeeSetting) {
-    return priorityFeeSetting !== undefined && priorityFeeSetting !== types_1.PriorityFeeSetting.None;
+    return (priorityFeeSetting !== undefined &&
+        priorityFeeSetting !== types_1.PriorityFeeSetting.None);
 }

package/package.json

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

package/src/services/transactions/transactionUtils.ts

@@ -56,7 +56,11 @@ import {
   getJupiterErrorFromCode,
   JUPITER_PROGRAM_ID,
 } from "../../jupiter-sdk";
-import { TransactionItemInputs, BundleSimulationError, PriorityFeeSetting } from "../../types";
+import {
+  TransactionItemInputs,
+  BundleSimulationError,
+  PriorityFeeSetting,
+} from "../../types";
 import { isMarginfiProgram } from "../../constants";
 
 interface wSolTokenUsage {
@@ -221,11 +225,18 @@ async function transactionChoresBefore(
     const tokenAccount = isSolautoAction("Withdraw", solautoAction)
       ? client.signerSupplyTa
       : client.signerDebtTa;
+
+    console.log("withdraw", isSolautoAction("Withdraw", solautoAction));
+    console.log(tokenAccount);
+    console.log(
+      "already getting created",
+      accountsGettingCreated.includes(tokenAccount.toString())
+    );
     if (accountsGettingCreated.includes(tokenAccount.toString())) {
       continue;
     }
 
-    if (!getSolanaAccountCreated(client.umi, tokenAccount)) {
+    if (!(await getSolanaAccountCreated(client.umi, tokenAccount))) {
       chores = chores.add(
         createAssociatedTokenAccountUmiIx(
           client.signer,
@@ -239,6 +250,7 @@ async function transactionChoresBefore(
     }
   }
 
+  console.log(chores.getInstructions().length);
   return chores;
 }
 
@@ -729,5 +741,8 @@ export function getErrorInfo(
 }
 
 export function usePriorityFee(priorityFeeSetting?: PriorityFeeSetting) {
-  return priorityFeeSetting !== undefined && priorityFeeSetting !== PriorityFeeSetting.None;
-}
+  return (
+    priorityFeeSetting !== undefined &&
+    priorityFeeSetting !== PriorityFeeSetting.None
+  );
+}