@haven-fi/solauto-sdk 1.0.115 → 1.0.117

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;IACT,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACG,SAAS,CACZ,CAwHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;IACT,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACG,SAAS,CACZ,CAwHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}

package/dist/transactions/transactionUtils.js

@@ -149,6 +149,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     }
     if (checkIntermediaryMfiAccount &&
         !(0, generalUtils_1.rpcAccountCreated)(intermediaryMarginfiAccount)) {
+        client.log("Creating intermediary marginfi account");
         chores = chores.add(client.createIntermediaryMarginfiAccount());
     }
     if (checkSignerSupplyTa &&

package/dist/transactions/transactionsManager.d.ts

@@ -1,7 +1,7 @@
 import { AddressLookupTableInput, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
 import { ErrorsToThrow } from "../utils/generalUtils";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
 declare class LookupTables {
     defaultLuts: string[];
@@ -39,11 +39,11 @@ declare class TransactionSet {
     name(): string;
 }
 export declare enum TransactionStatus {
-    Skipped = 0,
-    Processing = 1,
-    AwaitingSignature = 2,
-    Queued = 3,
-    Successful = 4
+    Skipped = "Skipped",
+    Processing = "Processing",
+    AwaitingSignature = "Awaiting Signature",
+    Queued = "Queued",
+    Successful = "Successful"
 }
 export type TransactionManagerStatuses = {
     name: string;
@@ -53,16 +53,16 @@ export type TransactionManagerStatuses = {
 export declare class TransactionsManager {
     private txHandler;
     private statusCallback?;
-    private simulateOnly?;
+    private txType?;
     private mustBeAtomic?;
     private errorsToThrow?;
     private statuses;
     private lookupTables;
-    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, simulateOnly?: boolean | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined);
+    constructor(txHandler: SolautoClient | ReferralStateManager, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, txType?: TransactionRunType | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined);
     private assembleTransactionSets;
     updateStatus(name: string, status: TransactionStatus, txSig?: string): void;
     debugAccounts(itemSet: TransactionSet, tx: TransactionBuilder): Promise<void>;
-    clientSend(items: TransactionItem[], prioritySetting?: PriorityFeeSetting): Promise<void>;
+    clientSend(transactions: TransactionItem[], prioritySetting?: PriorityFeeSetting): Promise<void>;
     send(items: TransactionItem[], prioritySetting?: PriorityFeeSetting, initialized?: boolean): Promise<void>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"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"}

package/dist/transactions/transactionsManager.js

@@ -109,17 +109,17 @@ class TransactionSet {
 }
 var TransactionStatus;
 (function (TransactionStatus) {
-    TransactionStatus[TransactionStatus["Skipped"] = 0] = "Skipped";
-    TransactionStatus[TransactionStatus["Processing"] = 1] = "Processing";
-    TransactionStatus[TransactionStatus["AwaitingSignature"] = 2] = "AwaitingSignature";
-    TransactionStatus[TransactionStatus["Queued"] = 3] = "Queued";
-    TransactionStatus[TransactionStatus["Successful"] = 4] = "Successful";
+    TransactionStatus["Skipped"] = "Skipped";
+    TransactionStatus["Processing"] = "Processing";
+    TransactionStatus["AwaitingSignature"] = "Awaiting Signature";
+    TransactionStatus["Queued"] = "Queued";
+    TransactionStatus["Successful"] = "Successful";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 class TransactionsManager {
-    constructor(txHandler, statusCallback, simulateOnly, mustBeAtomic, errorsToThrow) {
+    constructor(txHandler, statusCallback, txType, mustBeAtomic, errorsToThrow) {
         this.txHandler = txHandler;
         this.statusCallback = statusCallback;
-        this.simulateOnly = simulateOnly;
+        this.txType = txType;
         this.mustBeAtomic = mustBeAtomic;
         this.errorsToThrow = errorsToThrow;
         this.statuses = [];
@@ -189,7 +189,8 @@ class TransactionsManager {
             }
         }
     }
-    async clientSend(items, prioritySetting) {
+    async clientSend(transactions, prioritySetting) {
+        const items = [...transactions];
         const client = this.txHandler;
         const updateLookupTable = await client.updateLookupTable();
         const updateLutTxName = "update lookup table";
@@ -197,7 +198,7 @@ class TransactionsManager {
             updateLookupTable.updateLutTx.getInstructions().length > 0 &&
             updateLookupTable?.needsToBeIsolated) {
             this.updateStatus(updateLutTxName, TransactionStatus.Processing);
-            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, updateLookupTable.updateLutTx, this.simulateOnly, attemptNum, prioritySetting, () => this.updateStatus(updateLutTxName, TransactionStatus.AwaitingSignature)), 3, 150, this.errorsToThrow);
+            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, updateLookupTable.updateLutTx, this.txType, attemptNum, prioritySetting, () => this.updateStatus(updateLutTxName, TransactionStatus.AwaitingSignature)), 3, 150, this.errorsToThrow);
             this.updateStatus(updateLutTxName, TransactionStatus.Successful);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
@@ -226,7 +227,7 @@ class TransactionsManager {
             client.resetLiveTxUpdates(false);
             throw e;
         });
-        if (!this.simulateOnly) {
+        if (this.txType !== "only-simulate") {
             await client.resetLiveTxUpdates();
         }
     }
@@ -256,7 +257,7 @@ class TransactionsManager {
             //   this.updateStatus(set.name(), TransactionStatus.Successful);
             // });
         }
-        else if (!this.simulateOnly || itemSets.length === 1) {
+        else if (this.txType !== "only-simulate" || itemSets.length === 1) {
             for (let i = 0; i < itemSets.length; i++) {
                 const getFreshItemSet = async (itemSet, attemptNum) => {
                     await itemSet.refetchAll(attemptNum);
@@ -295,7 +296,7 @@ class TransactionsManager {
                         if (this.txHandler.localTest) {
                             await this.debugAccounts(itemSet, tx);
                         }
-                        const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, this.simulateOnly, attemptNum, prioritySetting, () => this.updateStatus(itemSet.name(), TransactionStatus.AwaitingSignature));
+                        const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, this.txType, attemptNum, prioritySetting, () => this.updateStatus(itemSet.name(), TransactionStatus.AwaitingSignature));
                         this.updateStatus(itemSet.name(), TransactionStatus.Successful, txSig ? bs58_1.default.encode(txSig) : undefined);
                     }
                 }, 4, 150, this.errorsToThrow);

package/dist/types/solauto.d.ts

@@ -14,4 +14,5 @@ export declare enum PriorityFeeSetting {
     High = "High"
 }
 export type RebalanceAction = "boost" | "repay" | "dca";
+export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";
 //# sourceMappingURL=solauto.d.ts.map

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC"}

package/dist/utils/solanaUtils.d.ts

@@ -1,6 +1,6 @@
 import { AddressLookupTableInput, Signer, TransactionBuilder, Umi, WrappedInstruction } from "@metaplex-foundation/umi";
 import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getSolanaRpcConnection(heliusApiKey: string): [Connection, Umi];
 export declare function currentUnixSecondsSolana(umi: Umi): Promise<number>;
 export declare function getWrappedInstruction(signer: Signer, ix: TransactionInstruction): WrappedInstruction;
@@ -13,5 +13,5 @@ export declare function splTokenTransferUmiIx(signer: Signer, fromTa: PublicKey,
 export declare function getAdressLookupInputs(umi: Umi, lookupTableAddresses: string[]): Promise<AddressLookupTableInput[]>;
 export declare function assembleFinalTransaction(signer: Signer, tx: TransactionBuilder, computeUnitPrice: number, computeUnitLimit?: number): TransactionBuilder;
 export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting): Promise<number>;
-export declare function sendSingleOptimizedTransaction(umi: Umi, connection: Connection, tx: TransactionBuilder, simulateOnly?: boolean, attemptNum?: number, prioritySetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<Uint8Array | undefined>;
+export declare function sendSingleOptimizedTransaction(umi: Umi, connection: Connection, tx: TransactionBuilder, txType?: TransactionRunType, attemptNum?: number, prioritySetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<Uint8Array | undefined>;
 //# sourceMappingURL=solanaUtils.d.ts.map

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,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,GACnB,CAAC,UAAU,EAAE,GAAG,CAAC,CAOnB;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;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,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA0DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,GACnB,CAAC,UAAU,EAAE,GAAG,CAAC,CAOnB;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;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,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA4DjC"}

package/dist/utils/solanaUtils.js

@@ -154,17 +154,19 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     const feeEstimate = Math.round(resp.priorityFeeEstimate);
     return feeEstimate;
 }
-async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly, attemptNum, prioritySetting = types_1.PriorityFeeSetting.Default, onAwaitingSign) {
+async function sendSingleOptimizedTransaction(umi, connection, tx, txType, attemptNum, prioritySetting = types_1.PriorityFeeSetting.Default, onAwaitingSign) {
     console.log("Sending single optimized transaction...");
     console.log("Instructions: ", tx.getInstructions().length);
     console.log("Serialized transaction size: ", tx.getTransactionSize(umi));
     const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
     console.log("Compute unit price: ", feeEstimate);
-    // TODO: we should only retry simulation if it's not a solauto error
-    const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
-    const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
-    console.log("Compute unit limit: ", computeUnitLimit);
-    if (!simulateOnly) {
+    if (txType !== "skip-simulation") {
+        // TODO: we should only retry simulation if it's not a solauto error
+        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
+        const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
+        console.log("Compute unit limit: ", computeUnitLimit);
+    }
+    if (txType !== "only-simulate") {
         onAwaitingSign?.();
         const result = await assembleFinalTransaction(umi.identity, tx, feeEstimate, 800000).sendAndConfirm(umi, {
             send: {

package/local/updateSolautoLUT.ts

@@ -1,18 +1,20 @@
 import { PublicKey } from "@solana/web3.js";
 import { getTokenAccounts } from "../src/utils/accountUtils";
-import { SOLAUTO_MANAGER } from "../src/constants/generalAccounts";
+import { SOLAUTO_FEES_WALLET, SOLAUTO_MANAGER } from "../src/constants/generalAccounts";
 import { ALL_SUPPORTED_TOKENS } from "../src/constants/tokenConstants";
 import { updateLookupTable } from "./shared";
 import { SOLAUTO_LUT, STANDARD_LUT_ACCOUNTS } from "../src/constants/solautoConstants";
 
 const LOOKUP_TABLE_ADDRESS = new PublicKey(SOLAUTO_LUT);
 const solautoManagerTokenAccounts = getTokenAccounts(SOLAUTO_MANAGER, ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x)));
+const solautoFeeWalletTokenAccounts = getTokenAccounts(SOLAUTO_FEES_WALLET, ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x)));
 
 export async function updateSolautoLut(additionalAccounts?: string[]) {
   return updateLookupTable(
     [
       ...STANDARD_LUT_ACCOUNTS,
       ...solautoManagerTokenAccounts.map((x) => x.toString()),
+      ...solautoFeeWalletTokenAccounts.map(x => x.toString()),
       ...(additionalAccounts ?? [])
     ],
     LOOKUP_TABLE_ADDRESS

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -298,6 +298,7 @@ export async function rebalanceChoresBefore(
     checkIntermediaryMfiAccount &&
     !rpcAccountCreated(intermediaryMarginfiAccount)
   ) {
+    client.log("Creating intermediary marginfi account");
     chores = chores.add(
       (client as SolautoMarginfiClient).createIntermediaryMarginfiAccount()
     );

package/src/transactions/transactionsManager.ts

@@ -15,7 +15,7 @@ import {
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
@@ -164,11 +164,11 @@ class TransactionSet {
 }
 
 export enum TransactionStatus {
-  Skipped,
-  Processing,
-  AwaitingSignature,
-  Queued,
-  Successful,
+  Skipped = "Skipped",
+  Processing = "Processing",
+  AwaitingSignature = "Awaiting Signature",
+  Queued = "Queued",
+  Successful = "Successful",
 }
 
 export type TransactionManagerStatuses = {
@@ -184,7 +184,7 @@ export class TransactionsManager {
   constructor(
     private txHandler: SolautoClient | ReferralStateManager,
     private statusCallback?: (statuses: TransactionManagerStatuses) => void,
-    private simulateOnly?: boolean,
+    private txType?: TransactionRunType,
     private mustBeAtomic?: boolean,
     private errorsToThrow?: ErrorsToThrow
   ) {
@@ -272,9 +272,10 @@ export class TransactionsManager {
   }
 
   async clientSend(
-    items: TransactionItem[],
+    transactions: TransactionItem[],
     prioritySetting?: PriorityFeeSetting
   ) {
+    const items = [...transactions];
     const client = this.txHandler as SolautoClient;
 
     const updateLookupTable = await client.updateLookupTable();
@@ -291,7 +292,7 @@ export class TransactionsManager {
             this.txHandler.umi,
             this.txHandler.connection,
             updateLookupTable.updateLutTx,
-            this.simulateOnly,
+            this.txType,
             attemptNum,
             prioritySetting,
             () =>
@@ -351,7 +352,7 @@ export class TransactionsManager {
       throw e;
     });
 
-    if (!this.simulateOnly) {
+    if (this.txType !== "only-simulate") {
       await client.resetLiveTxUpdates();
     }
   }
@@ -389,7 +390,7 @@ export class TransactionsManager {
       // itemSets.forEach((set) => {
       //   this.updateStatus(set.name(), TransactionStatus.Successful);
       // });
-    } else if (!this.simulateOnly || itemSets.length === 1) {
+    } else if (this.txType !== "only-simulate" || itemSets.length === 1) {
       for (let i = 0; i < itemSets.length; i++) {
         const getFreshItemSet = async (
           itemSet: TransactionSet,
@@ -447,7 +448,7 @@ export class TransactionsManager {
                 this.txHandler.umi,
                 this.txHandler.connection,
                 tx,
-                this.simulateOnly,
+                this.txType,
                 attemptNum,
                 prioritySetting,
                 () =>

package/src/types/solauto.ts

@@ -16,4 +16,6 @@ export enum PriorityFeeSetting {
   High = "High"
 }
 
-export type RebalanceAction = "boost" | "repay" | "dca";
+export type RebalanceAction = "boost" | "repay" | "dca";
+
+export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";

package/src/utils/solanaUtils.ts

@@ -36,7 +36,7 @@ import {
   getLendingAccountEndFlashloanInstructionDataSerializer,
   getLendingAccountStartFlashloanInstructionDataSerializer,
 } from "../marginfi-sdk";
-import { PriorityFeeSetting } from "../types";
+import { PriorityFeeSetting, TransactionRunType } from "../types";
 
 export function getSolanaRpcConnection(
   heliusApiKey: string
@@ -281,7 +281,7 @@ export async function sendSingleOptimizedTransaction(
   umi: Umi,
   connection: Connection,
   tx: TransactionBuilder,
-  simulateOnly?: boolean,
+  txType?: TransactionRunType,
   attemptNum?: number,
   prioritySetting: PriorityFeeSetting = PriorityFeeSetting.Default,
   onAwaitingSign?: () => void
@@ -297,31 +297,33 @@ export async function sendSingleOptimizedTransaction(
   );
   console.log("Compute unit price: ", feeEstimate);
 
-  // TODO: we should only retry simulation if it's not a solauto error
-  const simulationResult = await retryWithExponentialBackoff(
-    async () =>
-      await simulateTransaction(
-        connection,
-        toWeb3JsTransaction(
-          await (
-            await assembleFinalTransaction(
-              umi.identity,
-              tx,
-              feeEstimate,
-              1_400_000
-            ).setLatestBlockhash(umi)
-          ).build(umi)
-        )
-      ),
-    3
-  );
-
-  const computeUnitLimit = Math.round(
-    simulationResult.value.unitsConsumed! * 1.1
-  );
-  console.log("Compute unit limit: ", computeUnitLimit);
+  if (txType !== "skip-simulation") {
+    // TODO: we should only retry simulation if it's not a solauto error
+    const simulationResult = await retryWithExponentialBackoff(
+      async () =>
+        await simulateTransaction(
+          connection,
+          toWeb3JsTransaction(
+            await (
+              await assembleFinalTransaction(
+                umi.identity,
+                tx,
+                feeEstimate,
+                1_400_000
+              ).setLatestBlockhash(umi)
+            ).build(umi)
+          )
+        ),
+      3
+    );
+  
+    const computeUnitLimit = Math.round(
+      simulationResult.value.unitsConsumed! * 1.1
+    );
+    console.log("Compute unit limit: ", computeUnitLimit);
+  }
 
-  if (!simulateOnly) {
+  if (txType !== "only-simulate") {
     onAwaitingSign?.();
     const result = await assembleFinalTransaction(
       umi.identity,

package/tests/transactions/solautoMarginfi.ts

@@ -1,18 +1,15 @@
 import { describe, it } from "mocha";
 import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
-import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
+import {
+  SolautoMarginfiClient,
+} from "../../src/clients/solautoMarginfiClient";
 import {
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import {
-  maxBoostToBps,
-  maxRepayFromBps,
-  maxRepayToBps,
-  toBaseUnit,
-} from "../../src/utils/numberUtils";
+import { maxBoostToBps, maxRepayFromBps, maxRepayToBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -21,6 +18,9 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
+import {
+  ACCOUNT_SIZE as TOKEN_ACCOUNT_SIZE,
+} from "@solana/spl-token";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
@@ -31,22 +31,25 @@ describe("Solauto Marginfi tests", async () => {
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
+
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
 
     const supply = NATIVE_MINT;
     const supplyDecimals = 9;
     const debtDecimals = 6;
 
-    await client.initialize({
-      signer,
-      positionId,
-      // authority: new PublicKey("92xmP49BQycn3t2HkGxLAweN3jjrExxSNpywA3xF7mYY")
-      // marginfiAccount: new PublicKey(
-      //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-      // ),
-      // supplyMint: NATIVE_MINT,
-      // debtMint: new PublicKey(USDC_MINT),
-    });
+    await client.initialize(
+      {
+        signer,
+        positionId,
+        // authority: new PublicKey("92xmP49BQycn3t2HkGxLAweN3jjrExxSNpywA3xF7mYY")
+        // marginfiAccount: new PublicKey(
+        //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+        // ),
+        // supplyMint: NATIVE_MINT,
+        // debtMint: new PublicKey(USDC_MINT),
+      }
+    );
 
     const transactionItems: TransactionItem[] = [];
     const settingParams: SolautoSettingsParametersInpArgs = {
@@ -67,19 +70,19 @@ describe("Solauto Marginfi tests", async () => {
     //   }, "open position")
     // );
 
-    const initialSupplyUsd = 150;
-    transactionItems.push(
-      new TransactionItem(async () => {
-        const [supplyPrice] = await getTokenPrices([supply]);
-        return {
-          tx: client.protocolInteraction(
-            solautoAction("Deposit", [
-              toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
-            ])
-          ),
-        };
-      }, "deposit")
-    );
+    // const initialSupplyUsd = 150;
+    // transactionItems.push(
+    //   new TransactionItem(async () => {
+    //     const [supplyPrice] = await getTokenPrices([supply]);
+    //     return {
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Deposit", [
+    //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+    //         ])
+    //       ),
+    //     };
+    //   }, "deposit")
+    // );
     // }
 
     // const maxLtvBps = client.solautoPositionState!.maxLtvBps;
@@ -120,13 +123,13 @@ describe("Solauto Marginfi tests", async () => {
     //   }, "deposit")
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async (attemptNum) =>
-    //       await buildSolautoRebalanceTransaction(client, 1500, attemptNum),
-    //     "rebalance"
-    //   )
-    // );
+    transactionItems.push(
+      new TransactionItem(
+        async (attemptNum) =>
+          await buildSolautoRebalanceTransaction(client, 1500, attemptNum),
+        "rebalance"
+      )
+    );
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -155,11 +158,13 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    await new TransactionsManager(
-      client,
-      undefined,
-      !payForTransactions,
-      useJitoBundle
-    ).clientSend(transactionItems);
+    // await new TransactionsManager(
+    //   client,
+    //   undefined,
+    //   !payForTransactions ? "only-simulate" : "normal",
+    //   useJitoBundle
+    // ).clientSend(transactionItems);
+
+    console.log((await client.umi.rpc.getRent(TOKEN_ACCOUNT_SIZE)).basisPoints);
   });
 });