@haven-fi/solauto-sdk 1.0.819 → 1.0.820

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,EACL,qBAAqB,EAErB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAyLrB,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;;;;EAyHxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAKrE"}
+{"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;AAyLrB,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;;;;EA0IxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAKrE"}

package/dist/services/transactions/transactionUtils.js

@@ -383,6 +383,14 @@ function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting)
         (0, utils_1.consoleLog)("Error instruction index:", errIxIdx);
         (0, utils_1.consoleLog)("Error code:", errCode);
         (0, utils_1.consoleLog)("Error instruction program:", errIx?.programId.toString());
+        if (errIx) {
+            (0, utils_1.consoleLog)("Error ix data length:", errIx.data.length);
+            (0, utils_1.consoleLog)("Error ix num keys:", errIx.keys.length);
+            (0, utils_1.consoleLog)("Error ix data (first 64 bytes hex):", Buffer.from(errIx.data.slice(0, 64)).toString("hex"));
+        }
+        (0, utils_1.consoleLog)("All ixs in failing tx:", txs[errTxIdx]
+            ?.getInstructions()
+            .map((ix, i) => `[${i}] ${ix.programId.toString()} (data: ${ix.data.length}B, keys: ${ix.keys.length})`));
         const solautoError = (0, generated_1.getSolautoErrorFromCode)(errCode ?? -1, (0, generated_1.createSolautoProgram)());
         const marginfiError = (0, marginfi_1.getMarginfiErrorFromCode)(errCode ?? -1, (0, marginfi_1.createMarginfiProgram)());
         if (errCode !== undefined &&

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAiD5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsE5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}

package/dist/utils/switchboardUtils.js

@@ -85,6 +85,21 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
     if (!pullIxs || !pullIxs.length) {
         throw new Error("Unable to fetch SWB crank IX");
     }
+    (0, generalUtils_1.consoleLog)("SWB pullIxs count:", pullIxs.length);
+    pullIxs.forEach((ix, i) => {
+        (0, generalUtils_1.consoleLog)(`SWB pullIx[${i}] programId: ${ix.programId.toString()}`);
+        (0, generalUtils_1.consoleLog)(`SWB pullIx[${i}] data length: ${ix.data.length}`);
+        (0, generalUtils_1.consoleLog)(`SWB pullIx[${i}] keys count: ${ix.keys.length}`);
+        if (ix.data.length > 0) {
+            (0, generalUtils_1.consoleLog)(`SWB pullIx[${i}] data (first 128 bytes hex): ${Buffer.from(ix.data.slice(0, 128)).toString("hex")}`);
+        }
+    });
+    (0, generalUtils_1.consoleLog)("SWB oracle responses:", responses.length);
+    (0, generalUtils_1.consoleLog)("SWB oracle response details:", responses.map((r) => ({
+        value: r.value?.toString(),
+        error: r.error,
+        oracle: r.oracle.pubkey.toString(),
+    })));
     (0, generalUtils_1.consoleLog)("Setting price locally...");
     const price = responses[0].value.toNumber();
     (0, generalUtils_1.consoleLog)(price);

package/local/txSandbox.ts

@@ -1,5 +1,5 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey, signerIdentity } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   buildSwbSubmitResponseTx,
@@ -8,10 +8,10 @@ import {
   fetchBank,
   getBatches,
   getClient,
-  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  JITO_SOL,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
   PriceType,
@@ -20,14 +20,13 @@ import {
   rebalance,
   safeFetchBank,
   safeFetchMarginfiAccount,
+  sendSingleOptimizedTransaction,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
   TransactionItem,
-  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
-import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = true;
 const testProgram = false;
@@ -53,30 +52,15 @@ export async function main() {
     lpEnv,
   });
 
-  await client.initializeNewSolautoPosition({
-    // positionId: 1,
-    positionId: 99,
-    supplyMint: NATIVE_MINT,
-    debtMint: new PublicKey(USDC),
-    lpPoolAccount: getMarginfiAccounts().defaultGroup,
-    // lpPoolAccount: new PublicKey("GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz")
+  await client.initializeExistingSolautoPosition({
+    positionId: 1,
+    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  // const transactionItems = [rebalance(client)];
-  const transactionItems: TransactionItem[] = [
-    new TransactionItem(
-      async () =>
-        await buildSwbSubmitResponseTx(
-          client.connection,
-          client.signer,
-          new PublicKey(NATIVE_MINT)
-          // new PublicKey(JITO_SOL)
-        )!
-    ),
-  ];
+  const transactionItems = [rebalance(client)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,
@@ -134,5 +118,45 @@ async function refreshAll() {
   }
 }
 
-main();
+async function testSwbOracleUpdate() {
+  (globalThis as any).SHOW_LOGS = true;
+
+  let [conn, umiLocal] = getSolanaRpcConnection(
+    LOCAL_IRONFORGE_API_URL,
+    testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+    lpEnv
+  );
+  umiLocal = umiLocal.use(signerIdentity(signer));
+
+  const mint = new PublicKey(JITO_SOL);
+  console.log("Building SWB oracle update tx for JitoSOL...");
+
+  const result = await buildSwbSubmitResponseTx(conn, signer, mint);
+  if (!result) {
+    console.log("No oracle update needed");
+    return;
+  }
+
+  console.log("Instructions count:", result.tx.getInstructions().length);
+  console.log("Lookup tables:", result.lookupTableAddresses);
+
+  console.log("Sending transaction...");
+  const sig = await sendSingleOptimizedTransaction(
+    umiLocal,
+    conn,
+    result.tx,
+    payForTransaction ? "normal" : "only-simulate",
+    PriorityFeeSetting.Default
+  );
+
+  if (sig) {
+    const bs58 = await import("bs58");
+    console.log("Transaction signature:", bs58.default.encode(sig));
+  } else {
+    console.log("Transaction simulation complete (no sig returned)");
+  }
+}
+
+// main();
 // refreshAll();
+testSwbOracleUpdate();

package/package.json

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

@@ -674,6 +674,23 @@ export function getErrorInfo(
     consoleLog("Error instruction index:", errIxIdx);
     consoleLog("Error code:", errCode);
     consoleLog("Error instruction program:", errIx?.programId.toString());
+    if (errIx) {
+      consoleLog("Error ix data length:", errIx.data.length);
+      consoleLog("Error ix num keys:", errIx.keys.length);
+      consoleLog(
+        "Error ix data (first 64 bytes hex):",
+        Buffer.from(errIx.data.slice(0, 64)).toString("hex")
+      );
+    }
+    consoleLog(
+      "All ixs in failing tx:",
+      txs[errTxIdx]
+        ?.getInstructions()
+        .map(
+          (ix, i) =>
+            `[${i}] ${ix.programId.toString()} (data: ${ix.data.length}B, keys: ${ix.keys.length})`
+        )
+    );
 
     const solautoError = getSolautoErrorFromCode(
       errCode ?? -1,

package/src/utils/switchboardUtils.ts

@@ -95,6 +95,27 @@ export async function buildSwbSubmitResponseTx(
     throw new Error("Unable to fetch SWB crank IX");
   }
 
+  consoleLog("SWB pullIxs count:", pullIxs.length);
+  pullIxs.forEach((ix, i) => {
+    consoleLog(`SWB pullIx[${i}] programId: ${ix.programId.toString()}`);
+    consoleLog(`SWB pullIx[${i}] data length: ${ix.data.length}`);
+    consoleLog(`SWB pullIx[${i}] keys count: ${ix.keys.length}`);
+    if (ix.data.length > 0) {
+      consoleLog(
+        `SWB pullIx[${i}] data (first 128 bytes hex): ${Buffer.from(ix.data.slice(0, 128)).toString("hex")}`
+      );
+    }
+  });
+  consoleLog("SWB oracle responses:", responses.length);
+  consoleLog(
+    "SWB oracle response details:",
+    responses.map((r) => ({
+      value: r.value?.toString(),
+      error: r.error,
+      oracle: r.oracle.pubkey.toString(),
+    }))
+  );
+
   consoleLog("Setting price locally...");
   const price = (responses[0].value as Big).toNumber();
   consoleLog(price);

package/local/.env

@@ -1 +0,0 @@
-ADDRESS_WHITELIST=5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe,He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz,E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe,DRP5cgM1JpnMySvwg3jqRP2VA2DXSWUjo6VGLkNZ2etb,FtwMsLNn4kBy2kpawC4izM8oUPbmfmbjjKNTcTUUDPzN