@haven-fi/solauto-sdk 1.0.658 → 1.0.659

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,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;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,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,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA8GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA4D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionsManager.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAEL,aAAa,EAQd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAM5E,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACxB,WAAW,EAAE,OAAO,CAAS;IAC7B,SAAS,EAAE,MAAM,CAAK;gBAGb,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;IAOhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAwGD,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,OAAc,EAC1B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAmBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAyGzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA4I7B,qBAAqB;YAgDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/services/transactions/transactionsManager.js

@@ -91,7 +91,7 @@ class TransactionSet {
             return false;
         }
         const singleTx = await this.getSingleTransaction();
-        const tx = (0, utils_1.addTxOptimizations)(this.txHandler.umi.identity, singleTx, 1, 1)
+        const tx = (0, utils_1.addTxOptimizations)(this.txHandler.umi, singleTx, 1, 1)
             .add(item.tx)
             .setAddressLookupTables(await this.lookupTables.getLutInputs([
             ...this.lutAddresses(),
@@ -270,10 +270,7 @@ class TransactionsManager {
         const items = [...transactions];
         const client = this.txHandler;
         const updateLut = await client.updateLookupTable();
-        if (updateLut &&
-            (updateLut?.new ||
-                updateLut.accountsToAdd.length > 4 ||
-                (client.pos.memecoinPosition && updateLut.accountsToAdd.length >= 2))) {
+        if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
             await this.updateLut(updateLut.tx, updateLut.new);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();

package/dist/utils/jitoUtils.d.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): PublicKey;
-export declare function getRequiredSigners(message: TransactionMessage): {
+export declare function getAdditionalSigners(message: TransactionMessage): {
     index: number;
     publicKey: string;
     isWritable: boolean;

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,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAelE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAuND,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,CA+F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAelE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAkGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAwHD,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,CA+F/B"}

package/dist/utils/jitoUtils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRandomTipAccount = getRandomTipAccount;
-exports.getRequiredSigners = getRequiredSigners;
+exports.getAdditionalSigners = getAdditionalSigners;
 exports.sendJitoBundledTransactions = sendJitoBundledTransactions;
 const web3_js_1 = require("@solana/web3.js");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -86,9 +86,24 @@ async function simulateJitoBundle(umi, txs) {
     const transactionResults = simulationResult.transactionResults;
     return transactionResults;
 }
+function getAdditionalSigners(message) {
+    const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
+    const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
+    const signersInfo = [];
+    for (let i = 0; i < numRequiredSignatures; i++) {
+        const publicKey = message.accounts[i].toString();
+        const isWritable = i < numWritableSigners;
+        signersInfo.push({
+            index: i,
+            publicKey,
+            isWritable,
+        });
+    }
+    return signersInfo;
+}
 async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigners, txs, 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)
+        return (0, solanaUtils_1.assembleFinalTransaction)(umi, tx, feeEstimates ? feeEstimates[i] : undefined, computeUnitLimits ? computeUnitLimits[i] : undefined)
             .setBlockhash(blockhash)
             .build(umi);
     }));
@@ -96,7 +111,7 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
         builtTxs = await userSigner.signAllTransactions(builtTxs);
         for (const signer of otherSigners) {
             for (let i = 0; i < builtTxs.length; i++) {
-                const requiredSigners = getRequiredSigners(builtTxs[i].message);
+                const requiredSigners = getAdditionalSigners(builtTxs[i].message);
                 if (requiredSigners
                     .map((x) => x.publicKey)
                     .includes(signer.publicKey.toString())) {
@@ -165,21 +180,6 @@ async function sendJitoBundle(umi, transactions) {
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(umi, bundleId) : [];
 }
-function getRequiredSigners(message) {
-    const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
-    const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
-    const signersInfo = [];
-    for (let i = 0; i < numRequiredSignatures; i++) {
-        const publicKey = message.accounts[i].toString();
-        const isWritable = i < numWritableSigners;
-        signersInfo.push({
-            index: i,
-            publicKey,
-            isWritable,
-        });
-    }
-    return signersInfo;
-}
 async function sendJitoBundledTransactions(umi, connection, userSigner, otherSigners, txs, 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);

package/dist/utils/solanaUtils.d.ts

@@ -11,8 +11,8 @@ export declare function closeTokenAccountUmiIx(signer: Signer, tokenAccount: Pub
 export declare function splTokenTransferUmiIx(signer: Signer, fromTa: PublicKey, toTa: PublicKey, authority: PublicKey, amount: bigint): WrappedInstruction;
 export declare function getWalletSplBalances(conn: Connection, wallet: PublicKey, tokenMints: PublicKey[]): Promise<bigint[]>;
 export declare function getAddressLookupInputs(umi: Umi, lookupTableAddresses: string[]): Promise<AddressLookupTableInput[]>;
-export declare function addTxOptimizations(signer: Signer, transaction: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
-export declare function assembleFinalTransaction(signer: Signer, transaction: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
+export declare function addTxOptimizations(umi: Umi, tx: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
+export declare function assembleFinalTransaction(umi: Umi, transaction: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
 export declare function getQnComputeUnitPriceEstimate(umi: Umi, programId: PublicKey, blockheight?: number): Promise<any>;
 export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting, useAccounts?: boolean): Promise<number | undefined>;
 export declare function sendSingleOptimizedTransaction(umi: Umi, connection: Connection, tx: TransactionBuilder, txType?: TransactionRunType, prioritySetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<Uint8Array | undefined>;

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAe9E,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,SAAS,EACrB,KAAK,CAAC,EAAE,UAAU,GACjB,CAAC,UAAU,EAAE,GAAG,CAAC,CAWnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AA+CD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAuEjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAe9E,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,SAAS,EACrB,KAAK,CAAC,EAAE,UAAU,GACjB,CAAC,UAAU,EAAE,GAAG,CAAC,CAWnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAmB1B;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AA+CD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoEjC"}

package/dist/utils/solanaUtils.js

@@ -99,17 +99,27 @@ async function getAddressLookupInputs(umi, lookupTableAddresses) {
         return acc;
     }, new Array());
 }
-function addTxOptimizations(signer, transaction, computeUnitPrice, computeUnitLimit) {
-    return transaction
-        .prepend(computeUnitPrice !== undefined
-        ? setComputeUnitPriceUmiIx(signer, computeUnitPrice)
-        : (0, umi_1.transactionBuilder)())
-        .prepend(computeUnitLimit
-        ? setComputeUnitLimitUmiIx(signer, computeUnitLimit)
-        : (0, umi_1.transactionBuilder)());
+function addTxOptimizations(umi, tx, computeUnitPrice, computeUnitLimit) {
+    const computePriceIx = computeUnitPrice !== undefined
+        ? setComputeUnitPriceUmiIx(umi.identity, computeUnitPrice)
+        : (0, umi_1.transactionBuilder)();
+    const computeLimitIx = computeUnitLimit
+        ? setComputeUnitLimitUmiIx(umi.identity, computeUnitLimit)
+        : (0, umi_1.transactionBuilder)();
+    const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
+    const oneOptimization = tx.prepend(computePriceIx);
+    if (allOptimizations.fitsInOneTransaction(umi)) {
+        return allOptimizations;
+    }
+    else if (oneOptimization.fitsInOneTransaction(umi)) {
+        return oneOptimization;
+    }
+    else {
+        return tx;
+    }
 }
-function assembleFinalTransaction(signer, transaction, computeUnitPrice, computeUnitLimit) {
-    const tx = addTxOptimizations(signer, transaction, computeUnitPrice, computeUnitLimit);
+function assembleFinalTransaction(umi, transaction, computeUnitPrice, computeUnitLimit) {
+    const tx = addTxOptimizations(umi, transaction, computeUnitPrice, computeUnitLimit);
     const marginfiStartFlSerializer = (0, marginfi_sdk_1.getLendingAccountStartFlashloanInstructionDataSerializer)();
     const marginfiStartFlDiscriminator = marginfiStartFlSerializer
         .serialize({
@@ -247,7 +257,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     const blockhash = await connection.getLatestBlockhash("confirmed");
     let computeUnitLimit = undefined;
     if (txType !== "skip-simulation") {
-        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, assembleFinalTransaction(umi.identity, tx, undefined, 1400000).setBlockhash(blockhash)), 3);
+        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, assembleFinalTransaction(umi, tx, undefined, 1400000).setBlockhash(blockhash)), 3);
         computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", computeUnitLimit);
     }
@@ -262,7 +272,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     }
     if (txType !== "only-simulate") {
         onAwaitingSign?.();
-        const signedTx = await assembleFinalTransaction(umi.identity, tx, cuPrice, computeUnitLimit)
+        const signedTx = await assembleFinalTransaction(umi, tx, cuPrice, computeUnitLimit)
             .setBlockhash(blockhash)
             .buildAndSign(umi);
         const txSig = await spamSendTransactionUntilConfirmed(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(signedTx), blockhash);

package/package.json

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

package/src/services/transactions/transactionsManager.ts

@@ -2,6 +2,7 @@ import bs58 from "bs58";
 import {
   PublicKey,
   TransactionExpiredBlockheightExceededError,
+  VersionedTransaction,
 } from "@solana/web3.js";
 import {
   AddressLookupTableInput,
@@ -154,7 +155,7 @@ class TransactionSet {
     }
 
     const singleTx = await this.getSingleTransaction();
-    const tx = addTxOptimizations(this.txHandler.umi.identity, singleTx, 1, 1)
+    const tx = addTxOptimizations(this.txHandler.umi, singleTx, 1, 1)
       .add(item.tx)
       .setAddressLookupTables(
         await this.lookupTables.getLutInputs([
@@ -443,12 +444,7 @@ export class TransactionsManager {
 
     const updateLut = await client.updateLookupTable();
 
-    if (
-      updateLut &&
-      (updateLut?.new ||
-        updateLut.accountsToAdd.length > 4 ||
-        (client.pos.memecoinPosition && updateLut.accountsToAdd.length >= 2))
-    ) {
+    if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
       await this.updateLut(updateLut.tx, updateLut.new);
     }
     this.lookupTables.defaultLuts = client.defaultLookupTables();

package/src/utils/jitoUtils.ts

@@ -129,6 +129,27 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
   return transactionResults;
 }
 
+
+export function getAdditionalSigners(message: TransactionMessage) {
+  const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
+
+  const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
+
+  const signersInfo = [];
+  for (let i = 0; i < numRequiredSignatures; i++) {
+    const publicKey = message.accounts[i].toString();
+    const isWritable = i < numWritableSigners;
+
+    signersInfo.push({
+      index: i,
+      publicKey,
+      isWritable,
+    });
+  }
+
+  return signersInfo;
+}
+
 async function umiToVersionedTransactions(
   umi: Umi,
   blockhash: string,
@@ -142,7 +163,7 @@ async function umiToVersionedTransactions(
   let builtTxs = await Promise.all(
     txs.map(async (tx, i) => {
       return assembleFinalTransaction(
-        userSigner,
+        umi,
         tx,
         feeEstimates ? feeEstimates[i] : undefined,
         computeUnitLimits ? computeUnitLimits[i] : undefined
@@ -156,7 +177,7 @@ async function umiToVersionedTransactions(
     builtTxs = await userSigner.signAllTransactions(builtTxs);
     for (const signer of otherSigners) {
       for (let i = 0; i < builtTxs.length; i++) {
-        const requiredSigners = getRequiredSigners(builtTxs[i].message);
+        const requiredSigners = getAdditionalSigners(builtTxs[i].message);
         if (
           requiredSigners
             .map((x) => x.publicKey)
@@ -247,26 +268,6 @@ async function sendJitoBundle(
   return bundleId ? await pollBundleStatus(umi, bundleId) : [];
 }
 
-export function getRequiredSigners(message: TransactionMessage) {
-  const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
-
-  const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
-
-  const signersInfo = [];
-  for (let i = 0; i < numRequiredSignatures; i++) {
-    const publicKey = message.accounts[i].toString();
-    const isWritable = i < numWritableSigners;
-
-    signersInfo.push({
-      index: i,
-      publicKey,
-      isWritable,
-    });
-  }
-
-  return signersInfo;
-}
-
 export async function sendJitoBundledTransactions(
   umi: Umi,
   connection: Connection,

package/src/utils/solanaUtils.ts

@@ -199,32 +199,38 @@ export async function getAddressLookupInputs(
 }
 
 export function addTxOptimizations(
-  signer: Signer,
-  transaction: TransactionBuilder,
+  umi: Umi,
+  tx: TransactionBuilder,
   computeUnitPrice?: number,
   computeUnitLimit?: number
 ) {
-  return transaction
-    .prepend(
-      computeUnitPrice !== undefined
-        ? setComputeUnitPriceUmiIx(signer, computeUnitPrice)
-        : transactionBuilder()
-    )
-    .prepend(
-      computeUnitLimit
-        ? setComputeUnitLimitUmiIx(signer, computeUnitLimit)
-        : transactionBuilder()
-    );
+  const computePriceIx =
+    computeUnitPrice !== undefined
+      ? setComputeUnitPriceUmiIx(umi.identity, computeUnitPrice)
+      : transactionBuilder();
+  const computeLimitIx = computeUnitLimit
+    ? setComputeUnitLimitUmiIx(umi.identity, computeUnitLimit)
+    : transactionBuilder();
+
+  const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
+  const oneOptimization = tx.prepend(computePriceIx);
+  if (allOptimizations.fitsInOneTransaction(umi)) {
+    return allOptimizations;
+  } else if (oneOptimization.fitsInOneTransaction(umi)) {
+    return oneOptimization;
+  } else {
+    return tx;
+  }
 }
 
 export function assembleFinalTransaction(
-  signer: Signer,
+  umi: Umi,
   transaction: TransactionBuilder,
   computeUnitPrice?: number,
   computeUnitLimit?: number
 ) {
   const tx = addTxOptimizations(
-    signer,
+    umi,
     transaction,
     computeUnitPrice,
     computeUnitLimit
@@ -439,12 +445,9 @@ export async function sendSingleOptimizedTransaction(
         await simulateTransaction(
           umi,
           connection,
-          assembleFinalTransaction(
-            umi.identity,
-            tx,
-            undefined,
-            1_400_000
-          ).setBlockhash(blockhash)
+          assembleFinalTransaction(umi, tx, undefined, 1_400_000).setBlockhash(
+            blockhash
+          )
         ),
       3
     );
@@ -465,7 +468,7 @@ export async function sendSingleOptimizedTransaction(
   if (txType !== "only-simulate") {
     onAwaitingSign?.();
     const signedTx = await assembleFinalTransaction(
-      umi.identity,
+      umi,
       tx,
       cuPrice,
       computeUnitLimit

package/tests/transactions/shared.ts

@@ -40,7 +40,6 @@ export async function e2eTransactionTest(
 
   await client.initialize({
     positionId: 1,
-    new: true,
     supplyMint,
     debtMint,
   });
@@ -55,7 +54,7 @@ export async function e2eTransactionTest(
   };
 
   const supplyUsd = 100;
-  const debtUsd = withFlashLoan ? 60 : 10;
+  const debtUsd = withFlashLoan ? 60 : 3;
   const [supplyPrice, debtPrice] = await fetchTokenPrices([
     supplyMint,
     debtMint,