@haven-fi/solauto-sdk 1.0.516 → 1.0.518

package/dist/transactions/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAa7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YA4I7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAa7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA6FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAgJ7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/transactions/transactionsManager.js

@@ -76,6 +76,9 @@ class TransactionSet {
         this.lookupTables = lookupTables;
         this.items = items;
     }
+    async lutInputs() {
+        return await this.lookupTables.getLutInputs(this.lutAddresses());
+    }
     async fitsWith(item) {
         if (!item.tx) {
             return true;
@@ -112,10 +115,9 @@ class TransactionSet {
         const transactions = this.items
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
             .map((x) => x.tx);
-        const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
         return (0, umi_1.transactionBuilder)()
             .add(transactions)
-            .setAddressLookupTables(lutInputs);
+            .setAddressLookupTables(await this.lutInputs());
     }
     lutAddresses() {
         return Array.from(new Set(this.items.map((x) => x.lookupTableAddresses).flat()));
@@ -386,8 +388,9 @@ class TransactionsManager {
             }
             let txSigs;
             let error;
+            const lutInputs = await Promise.all(itemSets.map(async (x) => await x.lutInputs()));
             try {
-                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
+                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, lutInputs.flat(), this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
             }
             catch (e) {
                 error = e;

package/dist/utils/jitoUtils.d.ts

@@ -1,5 +1,5 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
+import { Signer, TransactionBuilder, Umi, TransactionMessage, AddressLookupTableInput } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): PublicKey;
 export declare function getRequiredSigners(message: TransactionMessage): {
@@ -7,5 +7,5 @@ export declare function getRequiredSigners(message: TransactionMessage): {
     publicKey: string;
     isWritable: boolean;
 }[];
-export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, userSigner: Signer, otherSigners: Signer[], txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
+export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, userSigner: Signer, otherSigners: Signer[], txs: TransactionBuilder[], lutInputs: AddressLookupTableInput[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
 //# sourceMappingURL=jitoUtils.d.ts.map

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,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AA+ND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,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,CAoG/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,SAAS,EAAE,uBAAuB,EAAE,EACpC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAsG/B"}

package/dist/utils/jitoUtils.js

@@ -98,9 +98,10 @@ async function simulateJitoBundle(umi, txs) {
     const transactionResults = simulationResult.transactionResults;
     return transactionResults;
 }
-async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, sign, feeEstimates, computeUnitLimits) {
+async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, lutInputs, sign, feeEstimates, computeUnitLimits) {
     let builtTxs = await Promise.all(txs.map(async (tx, i) => {
         return (0, solanaUtils_1.assembleFinalTransaction)(userSigner, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
+            .setAddressLookupTables(lutInputs)
             .setBlockhash(blockhash)
             .build(umi);
     }));
@@ -189,7 +190,7 @@ function getRequiredSigners(message) {
     }
     return signersInfo;
 }
-async function sendJitoBundledTransactions(umi, connection, userSigner, otherSigners, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
+async function sendJitoBundledTransactions(umi, connection, userSigner, otherSigners, txs, lutInputs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
     if (txs.length === 1) {
         const resp = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(umi, connection, txs[0], txType, priorityFeeSetting, onAwaitingSign);
         return resp ? [bytes_1.bs58.encode(resp)] : undefined;
@@ -207,13 +208,13 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     let builtTxs = [];
     let simulationResults;
     if (txType !== "skip-simulation") {
-        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, feeEstimates);
+        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, lutInputs, false, feeEstimates);
         (0, generalUtils_1.consoleLog)(builtTxs.map((x) => x.message.compiledInstructions.map((y) => x.message.staticAccountKeys[y.programIdIndex].toString())));
         simulationResults = await simulateJitoBundle(umi, builtTxs);
     }
     if (txType !== "only-simulate") {
         onAwaitingSign?.();
-        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, true, feeEstimates, simulationResults
+        builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, lutInputs, true, feeEstimates, simulationResults
             ? simulationResults.map((x) => x.unitsConsumed * 1.15)
             : undefined);
         const serializedTxs = builtTxs.map((x) => x.serialize());

package/dist/utils/solauto/rebalanceUtils.js

@@ -153,7 +153,7 @@ function getFlashLoanRequirements(client, values, attemptNum) {
         (0, generalUtils_2.tokenInfo)(client.debtMint).isStableCoin;
     const sufficientSignerSupplyLiquidity = false; // TODO
     const sufficientSignerDebtLiquidity = isJupLong; // TODO
-    const signerFlashLoan = Boolean(((attemptNum ?? 0) > 1 ||
+    const signerFlashLoan = Boolean(((attemptNum ?? 0) > 3 ||
         (insufficientDebtLiquidity && insufficientDebtLiquidity)) &&
         (sufficientSignerSupplyLiquidity || sufficientSignerDebtLiquidity));
     if (signerFlashLoan) {

package/package.json

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

package/src/transactions/transactionsManager.ts

@@ -123,6 +123,10 @@ class TransactionSet {
     public items: TransactionItem[] = []
   ) {}
 
+  async lutInputs(): Promise<AddressLookupTableInput[]> {
+    return await this.lookupTables.getLutInputs(this.lutAddresses());
+  }
+
   async fitsWith(item: TransactionItem): Promise<boolean> {
     if (!item.tx) {
       return true;
@@ -175,10 +179,9 @@ class TransactionSet {
       .filter((x) => x.tx && x.tx.getInstructions().length > 0)
       .map((x) => x.tx!);
 
-    const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
     return transactionBuilder()
       .add(transactions)
-      .setAddressLookupTables(lutInputs);
+      .setAddressLookupTables(await this.lutInputs());
   }
 
   lutAddresses(): string[] {
@@ -616,6 +619,9 @@ export class TransactionsManager {
 
         let txSigs: string[] | undefined;
         let error: Error | undefined;
+        const lutInputs = await Promise.all(
+          itemSets.map(async (x) => await x.lutInputs())
+        );
         try {
           txSigs = await sendJitoBundledTransactions(
             this.txHandler.umi,
@@ -623,6 +629,7 @@ export class TransactionsManager {
             this.txHandler.signer,
             this.txHandler.otherSigners,
             transactions,
+            lutInputs.flat(),
             this.txType,
             this.getUpdatedPriorityFeeSetting(prevError, attemptNum),
             () =>

package/src/utils/jitoUtils.ts

@@ -7,13 +7,17 @@ import {
   VersionedTransaction,
 } from "@solana/web3.js";
 import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
-import { JITO_BLOCK_ENGINE, JITO_TIP_ACCOUNTS } from "../constants/solautoConstants";
+import {
+  JITO_BLOCK_ENGINE,
+  JITO_TIP_ACCOUNTS,
+} from "../constants/solautoConstants";
 import {
   Signer,
   TransactionBuilder,
   Umi,
   WrappedInstruction,
   TransactionMessage,
+  AddressLookupTableInput,
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
@@ -150,6 +154,7 @@ async function umiToVersionedTransactions(
   userSigner: Signer,
   otherSigners: Signer[],
   txs: TransactionBuilder[],
+  lutInputs: AddressLookupTableInput[],
   sign: boolean,
   feeEstimates?: number[],
   computeUnitLimits?: number[]
@@ -162,6 +167,7 @@ async function umiToVersionedTransactions(
         feeEstimates ? feeEstimates[i] : undefined,
         computeUnitLimits ? computeUnitLimits[i] : undefined
       )
+        .setAddressLookupTables(lutInputs)
         .setBlockhash(blockhash)
         .build(umi);
     })
@@ -280,6 +286,7 @@ export async function sendJitoBundledTransactions(
   userSigner: Signer,
   otherSigners: Signer[],
   txs: TransactionBuilder[],
+  lutInputs: AddressLookupTableInput[],
   txType?: TransactionRunType,
   priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
   onAwaitingSign?: () => void
@@ -341,6 +348,7 @@ export async function sendJitoBundledTransactions(
       userSigner,
       otherSigners,
       txs,
+      lutInputs,
       false,
       feeEstimates
     );
@@ -363,6 +371,7 @@ export async function sendJitoBundledTransactions(
       userSigner,
       otherSigners,
       txs,
+      lutInputs,
       true,
       feeEstimates,
       simulationResults

package/src/utils/solauto/rebalanceUtils.ts

@@ -322,7 +322,7 @@ export function getFlashLoanRequirements(
   const sufficientSignerSupplyLiquidity = false; // TODO
   const sufficientSignerDebtLiquidity = isJupLong; // TODO
   const signerFlashLoan = Boolean(
-    ((attemptNum ?? 0) > 1 ||
+    ((attemptNum ?? 0) > 3 ||
       (insufficientDebtLiquidity && insufficientDebtLiquidity)) &&
       (sufficientSignerSupplyLiquidity || sufficientSignerDebtLiquidity)
   );