@haven-fi/solauto-sdk 1.0.190 → 1.0.192

package/dist/clients/solautoMarginfiClient.js

@@ -434,7 +434,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (state) {
             return state;
         }
-        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, undefined, undefined, this.livePositionUpdates);
+        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, !this.selfManaged && this.solautoPositionData === null ? this.supplyMint : undefined, !this.selfManaged && this.solautoPositionData === null ? this.debtMint : undefined, this.livePositionUpdates);
         if (freshState) {
             this.log("Fresh state", freshState);
             const supplyPrice = (0, generalUtils_1.safeGetPrice)(freshState?.supply.mint);

package/dist/utils/solanaUtils.d.ts

@@ -13,6 +13,6 @@ export declare function closeTokenAccountUmiIx(signer: Signer, tokenAccount: Pub
 export declare function splTokenTransferUmiIx(signer: Signer, fromTa: PublicKey, toTa: PublicKey, authority: PublicKey, amount: bigint): WrappedInstruction;
 export declare function getAdressLookupInputs(umi: Umi, lookupTableAddresses: string[]): Promise<AddressLookupTableInput[]>;
 export declare function assembleFinalTransaction(signer: Signer, tx: TransactionBuilder, computeUnitPrice: number, computeUnitLimit?: number): TransactionBuilder;
-export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting): Promise<number>;
+export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting): Promise<number | undefined>;
 export declare function sendSingleOptimizedTransaction(umi: Umi, connection: Connection, tx: TransactionBuilder, txType?: TransactionRunType, attemptNum?: number, prioritySetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<Uint8Array | undefined>;
 //# sourceMappingURL=solanaUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GACb,CAAC,UAAU,EAAE,GAAG,CAAC,CAInB;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,GAAG,EAAE,GAAG,EACR,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;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA+DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GACb,CAAC,UAAU,EAAE,GAAG,CAAC,CAInB;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,GAAG,EAAE,GAAG,EACR,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;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsB7B;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAkEjC"}

package/dist/utils/solanaUtils.js

@@ -141,33 +141,42 @@ async function simulateTransaction(connection, transaction) {
 async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
     const serializedTransaction = bs58_1.default.encode(web3Transaction.serialize());
-    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
-        {
-            transaction: serializedTransaction,
-            options: {
-                priorityLevel: prioritySetting.toString(),
+    let feeEstimate;
+    try {
+        const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+            {
+                transaction: serializedTransaction,
+                options: {
+                    priorityLevel: prioritySetting.toString(),
+                },
             },
-        },
-    ]);
-    const feeEstimate = Math.round(resp.priorityFeeEstimate);
+        ]);
+        feeEstimate = Math.round(resp.priorityFeeEstimate);
+    }
+    catch (e) {
+        console.error(e);
+    }
     return feeEstimate;
 }
 async function sendSingleOptimizedTransaction(umi, connection, tx, txType, attemptNum, prioritySetting = types_1.PriorityFeeSetting.Default, onAwaitingSign) {
     (0, generalUtils_1.consoleLog)("Sending single optimized transaction...");
     (0, generalUtils_1.consoleLog)("Instructions: ", tx.getInstructions().length);
     (0, generalUtils_1.consoleLog)("Serialized transaction size: ", tx.getTransactionSize(umi));
-    const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
-    (0, generalUtils_1.consoleLog)("Compute unit price: ", feeEstimate);
+    let cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
+    if (!cuPrice) {
+        cuPrice = 1000000;
+    }
+    (0, generalUtils_1.consoleLog)("Compute unit price: ", cuPrice);
     let computeUnitLimit = undefined;
     if (txType !== "skip-simulation") {
         // TODO: we should only retry simulation if it's not a solauto error
-        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
+        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, cuPrice, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
         computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", computeUnitLimit);
     }
     if (txType !== "only-simulate") {
         onAwaitingSign?.();
-        const result = await assembleFinalTransaction(umi.identity, tx, feeEstimate, computeUnitLimit).sendAndConfirm(umi, {
+        const result = await assembleFinalTransaction(umi.identity, tx, cuPrice, computeUnitLimit).sendAndConfirm(umi, {
             send: {
                 skipPreflight: true,
                 commitment: "confirmed",

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -651,8 +651,8 @@ export class SolautoMarginfiClient extends SolautoClient {
     const freshState = await getMarginfiAccountPositionState(
       this.umi,
       this.marginfiAccountPk,
-      undefined,
-      undefined,
+      !this.selfManaged && this.solautoPositionData === null ? this.supplyMint : undefined,
+      !this.selfManaged && this.solautoPositionData === null ? this.debtMint : undefined,
       this.livePositionUpdates
     );
 

package/src/utils/solanaUtils.ts

@@ -254,20 +254,26 @@ export async function getComputeUnitPriceEstimate(
   umi: Umi,
   tx: TransactionBuilder,
   prioritySetting: PriorityFeeSetting
-): Promise<number> {
+): Promise<number | undefined> {
   const web3Transaction = toWeb3JsTransaction(
     (await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi)
   );
   const serializedTransaction = bs58.encode(web3Transaction.serialize());
-  const resp = await umi.rpc.call("getPriorityFeeEstimate", [
-    {
-      transaction: serializedTransaction,
-      options: {
-        priorityLevel: prioritySetting.toString(),
+
+  let feeEstimate: number | undefined;
+  try {
+    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+      {
+        transaction: serializedTransaction,
+        options: {
+          priorityLevel: prioritySetting.toString(),
+        },
       },
-    },
-  ]);
-  const feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+    ]);
+    feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+  } catch (e) {
+    console.error(e);
+  }
 
   return feeEstimate;
 }
@@ -285,12 +291,15 @@ export async function sendSingleOptimizedTransaction(
   consoleLog("Instructions: ", tx.getInstructions().length);
   consoleLog("Serialized transaction size: ", tx.getTransactionSize(umi));
 
-  const feeEstimate = await getComputeUnitPriceEstimate(
+  let cuPrice = await getComputeUnitPriceEstimate(
     umi,
     tx,
     prioritySetting
   );
-  consoleLog("Compute unit price: ", feeEstimate);
+  if (!cuPrice) {
+    cuPrice = 1000000;
+  }
+  consoleLog("Compute unit price: ", cuPrice);
 
   let computeUnitLimit = undefined;
   if (txType !== "skip-simulation") {
@@ -304,7 +313,7 @@ export async function sendSingleOptimizedTransaction(
               await assembleFinalTransaction(
                 umi.identity,
                 tx,
-                feeEstimate,
+                cuPrice,
                 1_400_000
               ).setLatestBlockhash(umi)
             ).build(umi)
@@ -324,7 +333,7 @@ export async function sendSingleOptimizedTransaction(
     const result = await assembleFinalTransaction(
       umi.identity,
       tx,
-      feeEstimate,
+      cuPrice,
       computeUnitLimit
     ).sendAndConfirm(umi, {
       send: {

package/tests/transactions/solautoMarginfi.ts

@@ -24,7 +24,7 @@ describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
   const signer = setupTest("solauto-manager");
 
-  const payForTransactions = false;
+  const payForTransactions = true;
   const useJitoBundle = false;
   const positionId = 1;
 
@@ -159,13 +159,11 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // await new TransactionsManager(
-    //   client,
-    //   undefined,
-    //   !payForTransactions ? "only-simulate" : "normal",
-    //   useJitoBundle
-    // ).clientSend(transactionItems);
-
-    console.log(await getMarginfiAccountPositionState(client.umi, new PublicKey("8SZUhT1Jwiz1LKkeSsBwvwZyKH1UrzW3r8yiC6R3LLf7")));
+    await new TransactionsManager(
+      client,
+      undefined,
+      !payForTransactions ? "only-simulate" : "normal",
+      useJitoBundle
+    ).clientSend(transactionItems);
   });
 });