@haven-fi/solauto-sdk 1.0.395 → 1.0.397

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA2MD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAuE/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA2MD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwE/B"}

package/dist/utils/jitoUtils.js

@@ -98,7 +98,7 @@ async function simulateJitoBundle(umi, txs) {
             }
             throw new Error(txFailure ? txFailure[1] : resValue.summary.failed.toString());
         }
-        else if (res.error.message) {
+        else if (res.error && res.error.message) {
             throw new Error(res.error.message);
         }
         return res;
@@ -149,10 +149,10 @@ async function pollBundleStatus(bundleId, interval = 1000, timeout = 40000) {
     }
     throw new web3_js_1.TransactionExpiredBlockheightExceededError("Unable to confirm transaction. Try a higher priority fee.");
 }
-async function sendJitoBundle(transactions) {
+async function sendJitoBundle(umi, transactions) {
     let resp;
     try {
-        resp = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
+        resp = await axios_1.default.post(umi.rpc.getEndpoint(), {
             jsonrpc: "2.0",
             id: 1,
             method: "sendBundle",
@@ -198,7 +198,7 @@ async function sendJitoBundledTransactions(umi, signer, txs, txType, priorityFee
             throw new Error("A transaction is too large");
         }
         onAwaitingSign?.();
-        const txSigs = await sendJitoBundle(serializedTxs.map((x) => bs58_1.default.encode(x)));
+        const txSigs = await sendJitoBundle(umi, serializedTxs.map((x) => bs58_1.default.encode(x)));
         return txSigs.length > 0 ? txSigs : undefined;
     }
     return undefined;

package/package.json

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

package/src/utils/jitoUtils.ts

@@ -130,7 +130,7 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
       }
 
       throw new Error(txFailure ? txFailure[1] : resValue.summary.failed.toString());
-    } else if (res.error.message) {
+    } else if (res.error && res.error.message) {
       throw new Error(res.error.message);
     }
 
@@ -213,11 +213,11 @@ async function pollBundleStatus(
   );
 }
 
-async function sendJitoBundle(transactions: string[]): Promise<string[]> {
+async function sendJitoBundle(umi: Umi, transactions: string[]): Promise<string[]> {
   let resp: any;
   try {
     resp = await axios.post<{ result: string }>(
-      `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
+      umi.rpc.getEndpoint(),
       {
         jsonrpc: "2.0",
         id: 1,
@@ -311,6 +311,7 @@ export async function sendJitoBundledTransactions(
 
     onAwaitingSign?.();
     const txSigs = await sendJitoBundle(
+      umi,
       serializedTxs.map((x) => base58.encode(x))
     );
     return txSigs.length > 0 ? txSigs : undefined;

package/tests/transactions/solautoMarginfi.ts

@@ -60,12 +60,12 @@ export function getLeverageFactor(
 }
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
-  const payForTransactions = false;
-  const testProgram = false;
-  const positionId = 4;
+  const payForTransactions = true;
+  const testProgram = true;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -81,7 +81,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -91,7 +91,8 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    console.log(await client.getFreshPositionState());
+    // console.log(await getAllPositionsByAuthority(client.umi, new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"), PositionType.Leverage));
+
 
     // console.log(JSON.stringify(await getJupPriceData([new PublicKey("7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2")], true), null, 2));
     // console.log(JSON.stringify(await getJupPriceData([new PublicKey(POPCAT)], true), null, 2));
@@ -221,16 +222,16 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: client.protocolInteraction(
-    //         solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
-    //       ),
-    //     }),
-    //     "withdraw"
-    //   )
-    // );
+    transactionItems.push(
+      new TransactionItem(
+        async () => ({
+          tx: client.protocolInteraction(
+            solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
+          ),
+        }),
+        "withdraw"
+      )
+    );
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({