@haven-fi/solauto-sdk 1.0.692 → 1.0.694

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -203,7 +203,7 @@ class RebalanceTxBuilder {
         // TODO: remove me
         if ((0, utils_1.isMarginfiPosition)(this.client.pos)) {
             const weightedAssets = this.values.endResult.supplyUsd * (0, utils_1.bytesToI80F48)(this.client.pos.supplyBank.config.assetWeightInit.value);
-            const weightedLiabs = this.values.endResult.debtUsd * (0, utils_1.bytesToI80F48)(this.client.pos.debtBank.config.assetWeightInit.value);
+            const weightedLiabs = this.values.endResult.debtUsd * (0, utils_1.bytesToI80F48)(this.client.pos.debtBank.config.liabilityWeightInit.value);
             (0, utils_1.consoleLog)("Weighted assets & liabs:", weightedAssets, weightedLiabs);
         }
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);

package/dist/services/transactions/transactionUtils.js

@@ -348,7 +348,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
     let errCode;
     let errName;
     // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
-    const getComputeIxs = (txIdx) => (0, utils_1.addTxOptimizations)(umi, txs[txIdx], 1, !simulationSuccessful ? 1 : undefined).getInstructions().length - txs[txIdx].getInstructions().length;
+    const getComputeIxs = (txIdx) => (0, utils_1.addTxOptimizations)(umi, txs[txIdx], 1, simulationSuccessful ? 1 : undefined).getInstructions().length - txs[txIdx].getInstructions().length;
     try {
         if (error instanceof types_1.BundleSimulationError) {
             errTxIdx = error.details.transactionIdx;

package/local/shared.ts

@@ -11,7 +11,7 @@ import {
 import {
   getSolanaRpcConnection,
   getBatches,
-  buildIronforgeApiUrl,
+  LOCAL_IRONFORGE_API_URL,
 } from "../src";
 
 function loadSecretKey(keypairPath: string) {
@@ -26,9 +26,7 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
 }
 
 const keypair = Keypair.fromSecretKey(getSecretKey("solauto-fees"));
-const [connection, _] = getSolanaRpcConnection(
-  buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY ?? "")
-);
+const [connection, _] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
 
 export async function createAndSendV0Tx(
   txInstructions: TransactionInstruction[],

package/local/txSandbox.ts

@@ -29,7 +29,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = true;
+const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -53,82 +53,23 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+    positionId: 1,
+    authority: new PublicKey("R8Nnj1UqK1BRPnfJYj7MvfPUK3GmEzmgh1CwFFtUNsF"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const supplyBank = await fetchBank(
-    umi,
-    publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
-  );
-  const debtBank = await fetchBank(
-    umi,
-    publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
-  );
-  const supplyWeight = bytesToI80F48(supplyBank.config.assetWeightInit.value);
-  const debtWeight = bytesToI80F48(debtBank.config.liabilityWeightInit.value);
-
-  console.log(
-    getLiqUtilzationRateBps(
-      34.36833665228071,
-      23.61750715267401,
-      client.pos.state.liqThresholdBps
-    ),
-    34.36833665228071 * supplyWeight,
-    23.61750715267401 * debtWeight
-  );
-  console.log(
-    getLiqUtilzationRateBps(
-      34.328721976,
-      23.575158311,
-      client.pos.state.liqThresholdBps
-    ),
-    34.328721976 * supplyWeight,
-    23.575158311 * debtWeight
-  );
-  console.log(
-    getLiqUtilzationRateBps(
-      34.265152701,
-      23.530695876,
-      client.pos.state.liqThresholdBps
-    ),
-    34.265152701 * supplyWeight,
-    23.530695876 * debtWeight
-  );
-  console.log(client.pos.maxBoostToBps);
-  console.log(getMaxLiqUtilizationRateBps(client.pos.state.maxLtvBps, client.pos.state.liqThresholdBps, 0));
-
-  // const debtBank = await fetchBank(
-  //   umi,
-  //   publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
-  // );
-  // const supplyBank = await fetchBank(
-  //   umi,
-  //   publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
-  // );
-
-  // console.log(
-  //   bytesToI80F48(supplyBank.config.assetWeightInit.value),
-  //   bytesToI80F48(debtBank.config.liabilityWeightInit.value)
-  // );
-
-  // await client.pos.refreshPositionState();
+  const transactionItems = [rebalance(client)];
 
-  // console.log(await client.pos.utilizationRateBpsDrift());
-
-  // const transactionItems = [rebalance(client)];
-
-  // const txManager = new ClientTransactionsManager({
-  //   txHandler: client,
-  //   txRunType: payForTransaction ? "normal" : "only-simulate",
-  //   priorityFeeSetting: PriorityFeeSetting.Default,
-  //   retryConfig: { totalRetries: 5 },
-  // });
-  // const statuses = await txManager.send(transactionItems);
-  // consoleLog(statuses);
+  const txManager = new ClientTransactionsManager({
+    txHandler: client,
+    txRunType: payForTransaction ? "normal" : "only-simulate",
+    priorityFeeSetting: PriorityFeeSetting.Default,
+    retryConfig: { totalRetries: 1 },
+  });
+  const statuses = await txManager.send(transactionItems);
+  consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -350,7 +350,7 @@ export class RebalanceTxBuilder {
     // TODO: remove me
     if (isMarginfiPosition(this.client.pos)) {
       const weightedAssets = this.values.endResult.supplyUsd * bytesToI80F48(this.client.pos.supplyBank!.config.assetWeightInit.value);
-      const weightedLiabs = this.values.endResult.debtUsd * bytesToI80F48(this.client.pos.debtBank!.config.assetWeightInit.value);
+      const weightedLiabs = this.values.endResult.debtUsd * bytesToI80F48(this.client.pos.debtBank!.config.liabilityWeightInit.value);
       consoleLog("Weighted assets & liabs:", weightedAssets, weightedLiabs);
     }
 

package/src/services/transactions/transactionUtils.ts

@@ -621,7 +621,7 @@ export function getErrorInfo(
       umi,
       txs[txIdx],
       1,
-      !simulationSuccessful ? 1 : undefined
+      simulationSuccessful ? 1 : undefined
     ).getInstructions().length - txs[txIdx].getInstructions().length;
 
   try {