@haven-fi/solauto-sdk 1.0.759 → 1.0.760

package/dist/services/solauto/txHandler.d.ts

@@ -10,7 +10,7 @@ export interface TxHandlerProps {
     programId?: PublicKey;
     lpEnv?: ProgramEnv;
 }
-export declare abstract class TxHandler {
+export declare class TxHandler {
     rpcUrl: string;
     showLogs: boolean;
     programId: PublicKey;
@@ -21,7 +21,7 @@ export declare abstract class TxHandler {
     otherSigners: Signer[];
     constructor(props: TxHandlerProps);
     log(...args: any[]): void;
-    abstract defaultLookupTables(): string[];
-    abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
+    defaultLookupTables(): string[];
+    resetLiveTxUpdates(success?: boolean): void;
 }
 //# sourceMappingURL=txHandler.d.ts.map

package/dist/services/solauto/txHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAkB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,QAAQ,UAAS;IACjB,SAAS,EAAG,SAAS,CAAC;IACtB,KAAK,EAAG,UAAU,CAAC;IAEnB,UAAU,EAAG,UAAU,CAAC;IACxB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAEvB,KAAK,EAAE,cAAc;IAgCjC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAkB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,qBAAa,SAAS;IACb,MAAM,EAAG,MAAM,CAAC;IAChB,QAAQ,UAAS;IACjB,SAAS,EAAG,SAAS,CAAC;IACtB,KAAK,EAAG,UAAU,CAAC;IAEnB,UAAU,EAAG,UAAU,CAAC;IACxB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAEvB,KAAK,EAAE,cAAc;IAgCjC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,mBAAmB,IAAI,MAAM,EAAE;IAI/B,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;CACrC"}

package/dist/services/solauto/txHandler.js

@@ -32,5 +32,9 @@ class TxHandler {
     log(...args) {
         (0, utils_1.consoleLog)(...args);
     }
+    defaultLookupTables() {
+        return [];
+    }
+    resetLiveTxUpdates(success) { }
 }
 exports.TxHandler = TxHandler;

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,CAMlE;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,WAErE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAI9E"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,CAMlE;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CAqCZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,WAErE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAC5B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,CAAC,EAAE,GACV,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAInB"}

package/dist/utils/generalUtils.js

@@ -116,7 +116,9 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
                 .then(resolve)
                 .catch((error) => {
                 attemptNum++;
-                if (errorsToThrow &&
+                console.log(error.name, error.message);
+                console.log(errorsToThrow?.length, (errorsToThrow ?? []).some((errorType) => error instanceof errorType));
+                if (errorsToThrow?.length &&
                     errorsToThrow.some((errorType) => error instanceof errorType)) {
                     reject(error);
                     return;

package/local/txSandbox.ts

@@ -1,28 +1,41 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
+  fetchBank,
+  fetchMarginfiAccount,
+  fromBaseUnit,
+  getBankLiquidityAvailableBaseUnit,
   getBatches,
   getClient,
+  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  lendingAccountDeposit,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
+  SOLAUTO_MANAGER,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
+  toBaseUnit,
   TransactionItem,
+  TransactionsManager,
+  TxHandler,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
+import { getTokenAccount, tokenInfo } from "../dist";
 
-const payForTransaction = false;
+const payForTransaction = true;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
@@ -38,26 +51,66 @@ const signer = createSignerFromKeypair(
 );
 
 export async function main() {
-  const client = getClient(LendingPlatform.Marginfi, {
-    signer,
-    showLogs: true,
-    rpcUrl: LOCAL_IRONFORGE_API_URL,
-    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-    lpEnv,
-  });
+  const USDC_MINT = new PublicKey(USDC);
+  const group = new PublicKey("DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q");
+  const accounts =
+    getMarginfiAccounts("Prod").bankAccounts[group.toString()][
+      USDC_MINT.toString()
+    ];
 
-  await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
-  });
+  const bank = await fetchBank(umi, publicKey(accounts.bank));
+
+  const assets =
+    bytesToI80F48(bank.totalAssetShares.value) *
+    bytesToI80F48(bank.assetShareValue.value);
+  const liabs =
+    bytesToI80F48(bank.totalLiabilityShares.value) *
+    bytesToI80F48(bank.liabilityShareValue.value);
+
+  console.log(fromBaseUnit(BigInt(Math.round(assets)), 6));
+  console.log(fromBaseUnit(BigInt(Math.round(liabs)), 6));
+  const missingLiquidity = getBankLiquidityAvailableBaseUnit(bank, false);
+  console.log(fromBaseUnit(missingLiquidity, 6));
+
+  const marginfiAccount = await fetchMarginfiAccount(
+    umi,
+    publicKey("Fun9UD87tLCxqxoTvpGYAy6Uwk2eevFGDk1VvxpXbd5x")
+  );
+  const managerAssets =
+    bytesToI80F48(
+      marginfiAccount.lendingAccount.balances[0].assetShares.value
+    ) * bytesToI80F48(bank.assetShareValue.value);
+  console.log(fromBaseUnit(BigInt(Math.round(managerAssets)), 6));
 
-  const transactionItems = [rebalance(client)];
+  const depositAmt =
+    missingLiquidity * BigInt(-1) + BigInt(toBaseUnit(620 + 20, 6));
+  console.log("Depositing", fromBaseUnit(depositAmt, 6));
+  const transactionItems = [
+    new TransactionItem(
+      async () => ({
+        tx: lendingAccountDeposit(umi, {
+          signer,
+          signerTokenAccount: publicKey(
+            getTokenAccount(SOLAUTO_MANAGER, USDC_MINT)
+          ),
+          marginfiAccount: marginfiAccount.publicKey,
+          marginfiGroup: publicKey(group),
+          bank: bank.publicKey,
+          bankLiquidityVault: publicKey(accounts.liquidityVault),
+          amount: depositAmt,
+          depositUpToLimit: true,
+        }),
+      }),
+      "deposit"
+    ),
+  ];
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
+  const txManager = new TransactionsManager({
+    txHandler: new TxHandler({
+      signer,
+      rpcUrl: LOCAL_IRONFORGE_API_URL,
+      showLogs: true,
+    }),
     txRunType: payForTransaction ? "normal" : "only-simulate",
     priorityFeeSetting: PriorityFeeSetting.Default,
     retryConfig: { totalRetries: 2 },

package/package.json

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

package/src/services/solauto/txHandler.ts

@@ -17,7 +17,7 @@ export interface TxHandlerProps {
   lpEnv?: ProgramEnv;
 }
 
-export abstract class TxHandler {
+export class TxHandler {
   public rpcUrl!: string;
   public showLogs = false;
   public programId!: PublicKey;
@@ -64,7 +64,9 @@ export abstract class TxHandler {
     consoleLog(...args);
   }
 
-  abstract defaultLookupTables(): string[];
+  defaultLookupTables(): string[] {
+    return [];
+  }
 
-  abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
+  resetLiveTxUpdates(success?: boolean) {}
 }

package/src/utils/generalUtils.ts

@@ -126,8 +126,15 @@ export function retryWithExponentialBackoff<T>(
         .catch((error: Error) => {
           attemptNum++;
 
+          console.log(error.name, error.message);
+          console.log(
+            errorsToThrow?.length,
+            (errorsToThrow ?? []).some(
+              (errorType) => error instanceof errorType
+            )
+          );
           if (
-            errorsToThrow &&
+            errorsToThrow?.length &&
             errorsToThrow.some((errorType) => error instanceof errorType)
           ) {
             reject(error);
@@ -206,7 +213,10 @@ export function validPubkey(pubkey?: PublicKey | UmiPublicKey | string) {
   return Boolean(pubkey) && pubkey!.toString() !== PublicKey.default.toString();
 }
 
-export function createRecord<T>(keys: string[], values: T[]): Record<string, T> {
+export function createRecord<T>(
+  keys: string[],
+  values: T[]
+): Record<string, T> {
   return Object.fromEntries(
     zip(keys, values).map(([k, v]) => [k.toString(), v])
   );