@haven-fi/solauto-sdk 1.0.685 → 1.0.686

package/README.md

@@ -66,9 +66,10 @@ const transactionItems = [
 ];
 
 // Send all transactions atomically
-const statuses = await new solauto.TransactionsManager(client).clientSend(
-  transactionItems
-);
+const txManager = await new solauto.ClientTransactionsManager({
+  txHandler: client,
+});
+const statuses = txManager.send(transactionItems);
 ```
 
 ## Rebalancing an existing position
@@ -95,7 +96,8 @@ const transactionItems = [
   ),
 ];
 
-const statuses = await new solauto.TransactionsManager(client).clientSend(
-  transactionItems
-);
+const txManager = await new solauto.ClientTransactionsManager({
+  txHandler: client,
+});
+const statuses = txManager.send(transactionItems);
 ```

package/dist/constants/solautoConstants.d.ts

@@ -13,6 +13,7 @@ export declare const PRICES: {
         time: number;
     };
 };
+export declare const CHORES_TX_NAME = "account chores";
 export declare const JITO_TIP_ACCOUNTS: string[];
 export declare const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export declare const STANDARD_LUT_ACCOUNTS: string[];

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAEvG,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAEvG,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.JITO_TIP_ACCOUNTS = exports.PRICES = exports.REFERRER_PERCENTAGE = exports.OFFSET_FROM_MAX_LTV = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
+exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.JITO_TIP_ACCOUNTS = exports.CHORES_TX_NAME = exports.PRICES = exports.REFERRER_PERCENTAGE = exports.OFFSET_FROM_MAX_LTV = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const generalConstants_1 = require("./generalConstants");
@@ -14,6 +14,7 @@ exports.MIN_USD_SUPPORTED_POSITION = 1000;
 exports.OFFSET_FROM_MAX_LTV = 0.005;
 exports.REFERRER_PERCENTAGE = 0.15;
 exports.PRICES = {};
+exports.CHORES_TX_NAME = "account chores";
 exports.JITO_TIP_ACCOUNTS = [
     "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
     "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",

package/dist/services/transactions/index.d.ts

@@ -1,3 +1,4 @@
-export * from './transactionsManager';
-export * from './transactionUtils';
+export * from "./manager";
+export * from "./types";
+export * from "./transactionUtils";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC"}

package/dist/services/transactions/index.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./transactionsManager"), exports);
+__exportStar(require("./manager"), exports);
+__exportStar(require("./types"), exports);
 __exportStar(require("./transactionUtils"), exports);

package/dist/services/transactions/manager/clientTransactionsManager.d.ts

@@ -0,0 +1,10 @@
+import { SolautoClient } from "../../solauto";
+import { TransactionsManager } from "./transactionsManager";
+import { TransactionItem } from "../types";
+export declare class ClientTransactionsManager extends TransactionsManager<SolautoClient> {
+    private updateLut;
+    private addSwbOraclePullTxs;
+    private addChoreTxs;
+    send(transactions: TransactionItem[]): Promise<import("./transactionsManager").TransactionManagerStatuses>;
+}
+//# sourceMappingURL=clientTransactionsManager.d.ts.map

package/dist/services/transactions/manager/clientTransactionsManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAM5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YA4BnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAiClD"}

package/dist/services/transactions/manager/clientTransactionsManager.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientTransactionsManager = void 0;
+const umi_1 = require("@metaplex-foundation/umi");
+const transactionsManager_1 = require("./transactionsManager");
+const utils_1 = require("../../../utils");
+const types_1 = require("../types");
+const transactionUtils_1 = require("../transactionUtils");
+const constants_1 = require("../../../constants");
+class ClientTransactionsManager extends transactionsManager_1.TransactionsManager {
+    async updateLut(tx, newLut) {
+        const lutInputs = await this.lookupTables.getLutInputs();
+        const updateLutTxName = `${newLut ? "create" : "update"} lookup table`;
+        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(tx.setAddressLookupTables(lutInputs), updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), "skip-simulation"), this.signableRetries, 150, this.errorsToThrow);
+        await this.txHandler.refetchReferralState();
+    }
+    async addSwbOraclePullTxs(txs) {
+        const switchboardMints = [
+            ...((0, utils_1.isSwitchboardMint)(this.txHandler.pos.supplyMint)
+                ? [this.txHandler.pos.supplyMint]
+                : []),
+            ...((0, utils_1.isSwitchboardMint)(this.txHandler.pos.debtMint)
+                ? [this.txHandler.pos.debtMint]
+                : []),
+        ];
+        if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+            this.txHandler.log("Requires oracle update(s)...");
+            const txs = switchboardMints.map((x) => new types_1.TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
+            txs.unshift(...txs);
+        }
+    }
+    async addChoreTxs(txs, updateLutTx) {
+        let [choresBefore, choresAfter] = await (0, transactionUtils_1.getTransactionChores)(this.txHandler, (0, umi_1.transactionBuilder)().add(txs
+            .filter((x) => x.tx && x.tx.getInstructions().length > 0)
+            .map((x) => x.tx)));
+        if (updateLutTx) {
+            choresBefore.prepend(updateLutTx);
+        }
+        if (choresBefore.getInstructions().length) {
+            const chore = new types_1.TransactionItem(async () => ({ tx: choresBefore }), constants_1.CHORES_TX_NAME);
+            await chore.initialize();
+            txs.unshift(chore);
+            this.txHandler.log("Chores before: ", choresBefore.getInstructions().length);
+        }
+        if (choresAfter.getInstructions().length) {
+            const chore = new types_1.TransactionItem(async () => ({ tx: choresAfter }), constants_1.CHORES_TX_NAME);
+            await chore.initialize();
+            txs.push(chore);
+            this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);
+        }
+    }
+    async send(transactions) {
+        const items = [...transactions];
+        const client = this.txHandler;
+        const updateLut = await client.updateLookupTable();
+        if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
+            await this.updateLut(updateLut.tx, updateLut.new);
+        }
+        this.lookupTables.defaultLuts = client.defaultLookupTables();
+        await this.addSwbOraclePullTxs(items);
+        for (const item of items) {
+            await item.initialize();
+        }
+        await this.addChoreTxs(items, updateLut && !updateLut?.new ? updateLut.tx : undefined);
+        const result = await super.send(items).catch((e) => {
+            client.resetLiveTxUpdates(false);
+            throw e;
+        });
+        if (this.txRunType !== "only-simulate") {
+            await client.resetLiveTxUpdates();
+        }
+        return result;
+    }
+}
+exports.ClientTransactionsManager = ClientTransactionsManager;

package/dist/services/transactions/manager/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./transactionsManager";
+export * from "./clientTransactionsManager";
+//# sourceMappingURL=index.d.ts.map

package/dist/services/transactions/manager/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC"}

package/dist/services/transactions/manager/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./transactionsManager"), exports);
+__exportStar(require("./clientTransactionsManager"), exports);

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

@@ -0,0 +1,64 @@
+import { TransactionBuilder } from "@metaplex-foundation/umi";
+import { PriorityFeeSetting, TransactionRunType } from "../../../types";
+import { ErrorsToThrow } from "../../../utils";
+import { TxHandler } from "../../solauto";
+import { LookupTables, TransactionItem } from "../types";
+export declare class TransactionTooLargeError extends Error {
+    constructor(message: string);
+}
+export declare enum TransactionStatus {
+    Skipped = "Skipped",
+    Processing = "Processing",
+    Queued = "Queued",
+    Successful = "Successful",
+    Failed = "Failed"
+}
+export type TransactionManagerStatuses = {
+    name: string;
+    attemptNum: number;
+    status: TransactionStatus;
+    moreInfo?: string;
+    simulationSuccessful?: boolean;
+    txSig?: string;
+}[];
+interface RetryConfig {
+    signableRetries?: number;
+    totalRetries?: number;
+    retryDelay?: number;
+}
+export interface TransactionManagerArgs<T extends TxHandler> {
+    txHandler: T;
+    statusCallback?: (statuses: TransactionManagerStatuses) => void;
+    txRunType?: TransactionRunType;
+    priorityFeeSetting?: PriorityFeeSetting;
+    atomically?: boolean;
+    errorsToThrow?: ErrorsToThrow;
+    retryConfig?: RetryConfig;
+}
+export declare class TransactionsManager<T extends TxHandler> {
+    protected txHandler: T;
+    protected statusCallback?: (statuses: TransactionManagerStatuses) => void;
+    protected txRunType?: TransactionRunType;
+    protected priorityFeeSetting: PriorityFeeSetting;
+    protected atomically: boolean;
+    protected errorsToThrow?: ErrorsToThrow;
+    protected statuses: TransactionManagerStatuses;
+    protected lookupTables: LookupTables;
+    protected signableRetries: number;
+    protected totalRetries: number;
+    protected retryDelay: number;
+    updateOracleTxName: string;
+    constructor(args: TransactionManagerArgs<T>);
+    private assembleTransactionSets;
+    private updateStatus;
+    private debugAccounts;
+    protected getUpdatedPriorityFeeSetting(prevError: Error | undefined, attemptNum: number): PriorityFeeSetting;
+    private updateStatusForSets;
+    send(items: TransactionItem[]): Promise<TransactionManagerStatuses>;
+    private processTransactionsAtomically;
+    private processTransactionSet;
+    private refreshItemSets;
+    protected sendTransaction(tx: TransactionBuilder, txName: string, attemptNum: number, priorityFeeSetting?: PriorityFeeSetting, txRunType?: TransactionRunType): Promise<void>;
+}
+export {};
+//# sourceMappingURL=transactionsManager.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,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,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,SAAS;IACzD,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;YAmB7B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAwDjC"}

package/dist/services/transactions/{transactionsManager.js → manager/transactionsManager.js}

@@ -3,16 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionsManager = exports.TransactionStatus = exports.TransactionItem = exports.TransactionTooLargeError = void 0;
+exports.TransactionsManager = exports.TransactionStatus = exports.TransactionTooLargeError = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const web3_js_1 = require("@solana/web3.js");
-const umi_1 = require("@metaplex-foundation/umi");
-const types_1 = require("../../types");
-const constants_1 = require("../../constants");
-const utils_1 = require("../../utils");
-const transactionUtils_1 = require("./transactionUtils");
-const CHORES_TX_NAME = "account chores";
-const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
+const types_1 = require("../../../types");
+const utils_1 = require("../../../utils");
+const transactionUtils_1 = require("../transactionUtils");
+const types_2 = require("../types");
 class TransactionTooLargeError extends Error {
     constructor(message) {
         super(message);
@@ -21,124 +18,6 @@ class TransactionTooLargeError extends Error {
     }
 }
 exports.TransactionTooLargeError = TransactionTooLargeError;
-class LookupTables {
-    constructor(defaultLuts, umi) {
-        this.defaultLuts = defaultLuts;
-        this.umi = umi;
-        this.cache = [];
-    }
-    async getLutInputs(additionalAddresses) {
-        const addresses = [...this.defaultLuts, ...(additionalAddresses ?? [])];
-        const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
-        const missingAddresses = addresses.filter((x) => !currentCacheAddresses.includes(x));
-        if (missingAddresses) {
-            const additionalInputs = await (0, utils_1.getAddressLookupInputs)(this.umi, missingAddresses);
-            this.cache.push(...additionalInputs);
-        }
-        return this.cache;
-    }
-    reset() {
-        this.cache = this.cache.filter((x) => this.defaultLuts.includes(x.publicKey.toString()));
-    }
-}
-class TransactionItem {
-    constructor(fetchTx, name) {
-        this.fetchTx = fetchTx;
-        this.name = name;
-        this.initialized = false;
-        this.orderPrio = 0;
-    }
-    async initialize() {
-        await this.refetch(0);
-        this.initialized = true;
-    }
-    async refetch(attemptNum, prevError) {
-        const resp = await this.fetchTx(attemptNum, prevError);
-        this.tx = resp?.tx;
-        this.lookupTableAddresses = resp?.lookupTableAddresses ?? [];
-        this.orderPrio = resp?.orderPrio ?? 0;
-    }
-    uniqueAccounts() {
-        return Array.from(new Set(this.tx.getInstructions()
-            .map((x) => [
-            x.programId.toString(),
-            ...x.keys.map((y) => y.pubkey.toString()),
-        ])
-            .flat()));
-    }
-}
-exports.TransactionItem = TransactionItem;
-class TransactionSet {
-    constructor(txHandler, lookupTables, items = []) {
-        this.txHandler = txHandler;
-        this.lookupTables = lookupTables;
-        this.items = items;
-    }
-    async lutInputs() {
-        const lutInputs = await this.lookupTables.getLutInputs(this.lutAddresses());
-        return lutInputs.filter((lut, index, self) => index ===
-            self.findIndex((item) => item.publicKey.toString() === lut.publicKey.toString()));
-    }
-    async fitsWith(item) {
-        if (!item.tx) {
-            return true;
-        }
-        const accountLocks = Array.from(new Set([
-            ...this.items.map((x) => x.uniqueAccounts()),
-            ...item.uniqueAccounts(),
-        ])).length;
-        if (accountLocks > MAX_SUPPORTED_ACCOUNT_LOCKS) {
-            return false;
-        }
-        const singleTx = await this.getSingleTransaction();
-        const tx = (0, utils_1.addTxOptimizations)(this.txHandler.umi, singleTx, 1, 1)
-            .add(item.tx)
-            .setAddressLookupTables(await this.lookupTables.getLutInputs([
-            ...this.lutAddresses(),
-            ...item.lookupTableAddresses,
-        ]));
-        return tx.fitsInOneTransaction(this.txHandler.umi);
-    }
-    add(...items) {
-        this.items.push(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
-    }
-    prepend(...items) {
-        this.items.unshift(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
-    }
-    async reset() {
-        await this.txHandler.resetLiveTxUpdates();
-    }
-    async refetchAll(attemptNum, prevError) {
-        for (const item of this.items) {
-            await item.refetch(attemptNum, prevError);
-        }
-    }
-    async getSingleTransaction() {
-        const transactions = this.items
-            .filter((x) => x.tx && x.tx.getInstructions().length > 0)
-            .map((x) => x.tx);
-        return (0, umi_1.transactionBuilder)()
-            .add(transactions)
-            .setAddressLookupTables(await this.lutInputs());
-    }
-    lutAddresses() {
-        return Array.from(new Set(this.items.map((x) => x.lookupTableAddresses).flat()));
-    }
-    name() {
-        let names = this.items
-            .filter((x) => x.tx && Boolean(x.name))
-            .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 ");
-        }
-        else {
-            return names.join(" & ");
-        }
-    }
-}
 var TransactionStatus;
 (function (TransactionStatus) {
     TransactionStatus["Skipped"] = "Skipped";
@@ -148,21 +27,21 @@ var TransactionStatus;
     TransactionStatus["Failed"] = "Failed";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 class TransactionsManager {
-    constructor(txHandler, statusCallback, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, atomically = true, errorsToThrow, retryConfig) {
-        this.txHandler = txHandler;
-        this.statusCallback = statusCallback;
-        this.txType = txType;
-        this.priorityFeeSetting = priorityFeeSetting;
-        this.atomically = atomically;
-        this.errorsToThrow = errorsToThrow;
+    constructor(args) {
         this.statuses = [];
         this.updateOracleTxName = "update oracle";
-        this.lookupTables = new LookupTables(this.txHandler.defaultLookupTables(), this.txHandler.umi);
+        this.txHandler = args.txHandler;
+        this.statusCallback = args.statusCallback;
+        this.txRunType = args.txRunType;
+        this.priorityFeeSetting = args.priorityFeeSetting ?? types_1.PriorityFeeSetting.Min;
+        this.atomically = args.atomically ?? true;
+        this.errorsToThrow = args.errorsToThrow;
+        this.lookupTables = new types_2.LookupTables(this.txHandler.defaultLookupTables(), this.txHandler.umi);
         this.signableRetries =
-            retryConfig?.signableRetries ?? retryConfig?.totalRetries ?? 4;
+            args.retryConfig?.signableRetries ?? args.retryConfig?.totalRetries ?? 4;
         this.totalRetries =
-            retryConfig?.totalRetries ?? retryConfig?.signableRetries ?? 4;
-        this.retryDelay = retryConfig?.retryDelay ?? 150;
+            args.retryConfig?.totalRetries ?? args.retryConfig?.signableRetries ?? 4;
+        this.retryDelay = args.retryConfig?.retryDelay ?? 150;
     }
     async assembleTransactionSets(items) {
         let transactionSets = [];
@@ -179,7 +58,7 @@ class TransactionsManager {
                 throw new TransactionTooLargeError(`Exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`);
             }
             else {
-                let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
+                let newSet = new types_2.TransactionSet(this.txHandler, this.lookupTables, [
                     item,
                 ]);
                 for (let j = i; j >= 0; j--) {
@@ -260,75 +139,6 @@ class TransactionsManager {
             this.updateStatus(itemSet.name(), status, attemptNum, txSigs !== undefined ? txSigs[i] : undefined, simulationSuccessful, moreInfo);
         });
     }
-    async updateLut(tx, newLut) {
-        const lutInputs = await this.lookupTables.getLutInputs();
-        const updateLutTxName = `${newLut ? "create" : "update"} lookup table`;
-        await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(tx.setAddressLookupTables(lutInputs), updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), "skip-simulation"), this.signableRetries, 150, this.errorsToThrow);
-        await this.txHandler.refetchReferralState();
-    }
-    async clientSend(transactions) {
-        const items = [...transactions];
-        const client = this.txHandler;
-        const updateLut = await client.updateLookupTable();
-        if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
-            await this.updateLut(updateLut.tx, updateLut.new);
-        }
-        this.lookupTables.defaultLuts = client.defaultLookupTables();
-        for (const item of items) {
-            await item.initialize();
-        }
-        const allAccounts = items.flatMap((item) => {
-            return (item.tx
-                ?.getInstructions()
-                .filter((ix) => {
-                return (ix.programId.toString() === constants_1.SOLAUTO_PROD_PROGRAM.toString() ||
-                    ix.programId.toString() === constants_1.SOLAUTO_TEST_PROGRAM.toString());
-            })
-                .flatMap((ix) => {
-                return ix.keys.map((key) => key.pubkey.toString());
-            }) ?? []);
-        });
-        const swbOracle = allAccounts.find((x) => Object.values(constants_1.SWITCHBOARD_PRICE_FEED_IDS)
-            .map((x) => x.feedId)
-            .includes(x ?? ""));
-        if (swbOracle) {
-            const mint = new web3_js_1.PublicKey(Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).find((x) => constants_1.SWITCHBOARD_PRICE_FEED_IDS[x].feedId === swbOracle));
-            const stale = (await (0, utils_1.getSwitchboardFeedData)(client.connection, [mint]))[0]
-                .stale;
-            if (stale) {
-                this.txHandler.log("Requires oracle update...");
-                const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), this.updateOracleTxName);
-                await swbTx.initialize();
-                items.unshift(swbTx);
-            }
-        }
-        let [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 (updateLut && !updateLut?.new) {
-            choresBefore = choresBefore.prepend(updateLut.tx);
-        }
-        if (choresBefore.getInstructions().length > 0) {
-            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 }), CHORES_TX_NAME);
-            await chore.initialize();
-            items.push(chore);
-            this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);
-        }
-        const result = await this.send(items).catch((e) => {
-            client.resetLiveTxUpdates(false);
-            throw e;
-        });
-        if (this.txType !== "only-simulate") {
-            await client.resetLiveTxUpdates();
-        }
-        return result;
-    }
     async send(items) {
         this.statuses = [];
         this.lookupTables.reset();
@@ -390,13 +200,13 @@ class TransactionsManager {
             let txSigs;
             let error;
             try {
-                txSigs = await (0, utils_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, utils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txRunType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
             }
             catch (e) {
                 error = e;
             }
             if (error ||
-                (this.txType !== "only-simulate" &&
+                (this.txRunType !== "only-simulate" &&
                     (!Boolean(txSigs) || txSigs?.length === 0))) {
                 this.updateStatusForSets(itemSets, TransactionStatus.Failed, attemptNum, txSigs, undefined, error?.message);
                 throw error ? error : new Error("Unknown error");
@@ -475,10 +285,10 @@ class TransactionsManager {
         }
         return newItemSets;
     }
-    async sendTransaction(tx, txName, attemptNum, priorityFeeSetting, txType) {
+    async sendTransaction(tx, txName, attemptNum, priorityFeeSetting, txRunType) {
         this.updateStatus(txName, TransactionStatus.Processing, attemptNum);
         try {
-            const txSig = await (0, utils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, txType ?? this.txType, priorityFeeSetting, () => this.updateStatus(txName, TransactionStatus.Processing, attemptNum, undefined, true));
+            const txSig = await (0, utils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, txRunType ?? this.txRunType, priorityFeeSetting, () => this.updateStatus(txName, TransactionStatus.Processing, attemptNum, undefined, true));
             this.updateStatus(txName, TransactionStatus.Successful, attemptNum, txSig ? bs58_1.default.encode(txSig) : undefined);
         }
         catch (e) {

package/dist/services/transactions/types/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./lookupTables";
+export * from "./transactionItem";
+export * from "./transactionSet";
+//# sourceMappingURL=index.d.ts.map

package/dist/services/transactions/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}

package/dist/services/transactions/types/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lookupTables"), exports);
+__exportStar(require("./transactionItem"), exports);
+__exportStar(require("./transactionSet"), exports);

package/dist/services/transactions/types/lookupTables.d.ts

@@ -0,0 +1,10 @@
+import { AddressLookupTableInput, Umi } from "@metaplex-foundation/umi";
+export declare class LookupTables {
+    defaultLuts: string[];
+    private umi;
+    cache: AddressLookupTableInput[];
+    constructor(defaultLuts: string[], umi: Umi);
+    getLutInputs(additionalAddresses?: string[]): Promise<AddressLookupTableInput[]>;
+    reset(): void;
+}
+//# sourceMappingURL=lookupTables.d.ts.map

package/dist/services/transactions/types/lookupTables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lookupTables.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/types/lookupTables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAGxE,qBAAa,YAAY;IAId,WAAW,EAAE,MAAM,EAAE;IAC5B,OAAO,CAAC,GAAG;IAJb,KAAK,EAAE,uBAAuB,EAAE,CAAM;gBAG7B,WAAW,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,GAAG;IAGZ,YAAY,CAChB,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAkBrC,KAAK;CAKN"}

package/dist/services/transactions/types/lookupTables.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LookupTables = void 0;
+const utils_1 = require("../../../utils");
+class LookupTables {
+    constructor(defaultLuts, umi) {
+        this.defaultLuts = defaultLuts;
+        this.umi = umi;
+        this.cache = [];
+    }
+    async getLutInputs(additionalAddresses) {
+        const addresses = [...this.defaultLuts, ...(additionalAddresses ?? [])];
+        const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
+        const missingAddresses = addresses.filter((x) => !currentCacheAddresses.includes(x));
+        if (missingAddresses) {
+            const additionalInputs = await (0, utils_1.getAddressLookupInputs)(this.umi, missingAddresses);
+            this.cache.push(...additionalInputs);
+        }
+        return this.cache;
+    }
+    reset() {
+        this.cache = this.cache.filter((x) => this.defaultLuts.includes(x.publicKey.toString()));
+    }
+}
+exports.LookupTables = LookupTables;