@haven-fi/solauto-sdk 1.0.255 → 1.0.257

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;AAKzD,OAAO,EACL,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;AAK7D,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;AAgFD,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,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA6EzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA+BxB,qBAAqB;YAiDrB,cAAc;YAyBd,eAAe;CAkD9B"}
+{"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;AAKzD,OAAO,EACL,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;AAO7D,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;AAmFD,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,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4DzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA+BxB,qBAAqB;YAiDrB,cAAc;YAyBd,eAAe;CAkD9B"}

package/dist/transactions/transactionsManager.js

@@ -11,8 +11,8 @@ const generalUtils_1 = require("../utils/generalUtils");
 const transactionUtils_1 = require("./transactionUtils");
 const types_1 = require("../types");
 const web3_js_1 = require("@solana/web3.js");
-const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
+const CHORES_TX_NAME = "account chores";
 class TransactionTooLargeError extends Error {
     constructor(message) {
         super(message);
@@ -112,9 +112,12 @@ class TransactionSet {
         return Array.from(new Set(this.items.map((x) => x.lookupTableAddresses).flat()));
     }
     name() {
-        const names = this.items
+        let names = this.items
             .filter((x) => x.tx && x.name !== undefined)
             .map((x) => x.name.toLowerCase());
+        if (names.length > 1) {
+            names = names.filter(x => x !== CHORES_TX_NAME);
+        }
         if (names.length >= 3) {
             return [names.slice(0, -1).join(", "), names[names.length - 1]].join(", and ");
         }
@@ -247,43 +250,27 @@ class TransactionsManager {
         const items = [...transactions];
         const client = this.txHandler;
         const updateLookupTable = await client.updateLookupTable();
-        let isolatedLutTx = updateLookupTable?.new;
-        if (updateLookupTable && !isolatedLutTx) {
-            for (const item of items) {
-                await item.initialize();
-            }
-            const txAccounts = items.flatMap((x) => x.tx.getInstructions().flatMap((x) => x.keys.map((x) => x.pubkey)));
-            const newAccountsUsage = txAccounts.reduce((count, pk) => {
-                return updateLookupTable.accountsToAdd.find((x) => x.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(pk)))
-                    ? count + 1
-                    : count;
-            }, 0);
-            isolatedLutTx = Boolean(newAccountsUsage);
-        }
-        this.txHandler.log(updateLookupTable?.accountsToAdd.map(x => x.toString()));
-        if (updateLookupTable && isolatedLutTx) {
+        if (updateLookupTable && updateLookupTable?.new) {
             await this.updateLut(updateLookupTable.tx, updateLookupTable.new);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
-        if (!items[0].initialized || (updateLookupTable && isolatedLutTx)) {
-            for (const item of items) {
-                await item.initialize();
-            }
+        for (const item of items) {
+            await item.initialize();
         }
         const [choresBefore, choresAfter] = await (0, transactionUtils_1.getTransactionChores)(client, (0, umi_1.transactionBuilder)().add(items
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
             .map((x) => x.tx)));
-        if (updateLookupTable && !isolatedLutTx) {
+        if (updateLookupTable && !updateLookupTable?.new) {
             choresBefore.prepend(updateLookupTable.tx);
         }
         if (choresBefore.getInstructions().length > 0) {
-            const chore = new TransactionItem(async () => ({ tx: choresBefore }), "account chores");
+            const chore = new TransactionItem(async () => ({ tx: choresBefore }), CHORES_TX_NAME);
             await chore.initialize();
             items.unshift(chore);
             this.txHandler.log("Chores before: ", choresBefore.getInstructions().length);
         }
         if (choresAfter.getInstructions().length > 0) {
-            const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+            const chore = new TransactionItem(async () => ({ tx: choresAfter }), CHORES_TX_NAME);
             await chore.initialize();
             items.push(chore);
             this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);

package/package.json

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

@@ -26,6 +26,8 @@ import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
+const CHORES_TX_NAME = "account chores";
+
 export class TransactionTooLargeError extends Error {
   constructor(message: string) {
     super(message);
@@ -171,9 +173,12 @@ class TransactionSet {
   }
 
   name(): string {
-    const names = this.items
+    let names = this.items
       .filter((x) => x.tx && x.name !== undefined)
       .map((x) => x.name!.toLowerCase());
+    if (names.length > 1) {
+      names = names.filter(x => x !== CHORES_TX_NAME);
+    }
     if (names.length >= 3) {
       return [names.slice(0, -1).join(", "), names[names.length - 1]].join(
         ", and "
@@ -366,33 +371,13 @@ export class TransactionsManager {
 
     const updateLookupTable = await client.updateLookupTable();
 
-    let isolatedLutTx = updateLookupTable?.new;
-    if (updateLookupTable && !isolatedLutTx) {
-      for (const item of items) {
-        await item.initialize();
-      }
-      const txAccounts = items.flatMap((x) =>
-        x.tx!.getInstructions().flatMap((x) => x.keys.map((x) => x.pubkey))
-      );
-      const newAccountsUsage = txAccounts.reduce((count, pk) => {
-        return updateLookupTable.accountsToAdd.find((x) =>
-          x.equals(toWeb3JsPublicKey(pk))
-        )
-          ? count + 1
-          : count;
-      }, 0);
-      isolatedLutTx = Boolean(newAccountsUsage);
-    }
-    this.txHandler.log(updateLookupTable?.accountsToAdd.map(x => x.toString()));
-    if (updateLookupTable && isolatedLutTx) {
+    if (updateLookupTable && updateLookupTable?.new) {
       await this.updateLut(updateLookupTable.tx, updateLookupTable.new);
     }
     this.lookupTables.defaultLuts = client.defaultLookupTables();
 
-    if (!items[0].initialized || (updateLookupTable && isolatedLutTx)) {
-      for (const item of items) {
-        await item.initialize();
-      }
+    for (const item of items) {
+      await item.initialize();
     }
 
     const [choresBefore, choresAfter] = await getTransactionChores(
@@ -403,11 +388,14 @@ export class TransactionsManager {
           .map((x) => x.tx!)
       )
     );
-    if (updateLookupTable && !isolatedLutTx) {
+    if (updateLookupTable && !updateLookupTable?.new) {
       choresBefore.prepend(updateLookupTable.tx);
     }
     if (choresBefore.getInstructions().length > 0) {
-      const chore = new TransactionItem(async () => ({ tx: choresBefore }), "account chores");
+      const chore = new TransactionItem(
+        async () => ({ tx: choresBefore }),
+        CHORES_TX_NAME
+      );
       await chore.initialize();
       items.unshift(chore);
       this.txHandler.log(
@@ -416,7 +404,7 @@ export class TransactionsManager {
       );
     }
     if (choresAfter.getInstructions().length > 0) {
-      const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+      const chore = new TransactionItem(async () => ({ tx: choresAfter }), CHORES_TX_NAME);
       await chore.initialize();
       items.push(chore);
       this.txHandler.log(