@haven-fi/solauto-sdk 1.0.684 → 1.0.686

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;

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

@@ -0,0 +1,16 @@
+import { TransactionBuilder } from "@metaplex-foundation/umi";
+import { TransactionItemInputs } from "../../../types";
+export declare class TransactionItem {
+    fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>;
+    name?: string | undefined;
+    oracleInteractor?: boolean | undefined;
+    lookupTableAddresses: string[];
+    tx?: TransactionBuilder;
+    initialized: boolean;
+    orderPrio: number;
+    constructor(fetchTx: (attemptNum: number, prevError?: Error) => Promise<TransactionItemInputs | undefined>, name?: string | undefined, oracleInteractor?: boolean | undefined);
+    initialize(): Promise<void>;
+    refetch(attemptNum: number, prevError?: Error): Promise<void>;
+    uniqueAccounts(): string[];
+}
+//# sourceMappingURL=transactionItem.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transactionItem.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/types/transactionItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,qBAAa,eAAe;IAOjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IACb,gBAAgB,CAAC,EAAE,OAAO;IAXnC,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,EAClB,SAAS,CAAC,EAAE,KAAK,KACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA,EACb,gBAAgB,CAAC,EAAE,OAAO,YAAA;IAG7B,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK;IAOnD,cAAc,IAAI,MAAM,EAAE;CAY3B"}

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionItem = void 0;
+class TransactionItem {
+    constructor(fetchTx, name, oracleInteractor) {
+        this.fetchTx = fetchTx;
+        this.name = name;
+        this.oracleInteractor = oracleInteractor;
+        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;

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

@@ -0,0 +1,20 @@
+import { AddressLookupTableInput, TransactionBuilder } from "@metaplex-foundation/umi";
+import { TxHandler } from "../../solauto";
+import { LookupTables } from "./lookupTables";
+import { TransactionItem } from "./transactionItem";
+export declare class TransactionSet {
+    private txHandler;
+    lookupTables: LookupTables;
+    items: TransactionItem[];
+    constructor(txHandler: TxHandler, lookupTables: LookupTables, items?: TransactionItem[]);
+    lutInputs(): Promise<AddressLookupTableInput[]>;
+    fitsWith(item: TransactionItem): Promise<boolean>;
+    add(...items: TransactionItem[]): void;
+    prepend(...items: TransactionItem[]): void;
+    reset(): Promise<void>;
+    refetchAll(attemptNum: number, prevError?: Error): Promise<void>;
+    getSingleTransaction(): Promise<TransactionBuilder>;
+    lutAddresses(): string[];
+    name(): string;
+}
+//# sourceMappingURL=transactionSet.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transactionSet.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/types/transactionSet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAEvB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMpD,qBAAa,cAAc;IAEvB,OAAO,CAAC,SAAS;IACV,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,eAAe,EAAE;gBAFvB,SAAS,EAAE,SAAS,EACrB,YAAY,EAAE,YAAY,EAC1B,KAAK,GAAE,eAAe,EAAO;IAGhC,SAAS,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAY/C,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA4BvD,GAAG,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAM/B,OAAO,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAM7B,KAAK;IAIL,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK;IAMhD,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAUzD,YAAY,IAAI,MAAM,EAAE;IAMxB,IAAI,IAAI,MAAM;CAef"}

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

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionSet = void 0;
+const umi_1 = require("@metaplex-foundation/umi");
+const utils_1 = require("../../../utils");
+const constants_1 = require("../../../constants");
+const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
+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 !== constants_1.CHORES_TX_NAME);
+        }
+        if (names.length >= 3) {
+            return [names.slice(0, -1).join(", "), names[names.length - 1]].join(", and ");
+        }
+        else {
+            return names.join(" & ");
+        }
+    }
+}
+exports.TransactionSet = TransactionSet;

package/dist/solautoPosition/positionUtils.js

@@ -115,7 +115,7 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
         },
         maxLtvBps,
         liqThresholdBps,
-        lastRefreshed: BigInt((0, utils_1.currentUnixSeconds)()),
+        lastRefreshed: BigInt((0, utils_1.currentUnixSeconds)() - 100),
         padding1: [],
         padding2: [],
         padding: [],

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

@@ -1 +1 @@
-{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAcrE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAWrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}
+{"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,mBAQzB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAWnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAerE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,mBAYrC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}

package/dist/utils/instructionUtils.js

@@ -51,7 +51,7 @@ function borrow(client, baseUnitAmount) {
             __kind: "Borrow",
             fields: [baseUnitAmount],
         }),
-    }), "borrow");
+    }), "borrow", true);
 }
 function withdraw(client, amount) {
     return new services_1.TransactionItem(async () => ({
@@ -63,7 +63,7 @@ function withdraw(client, amount) {
                     : { __kind: "Some", fields: [amount] },
             ],
         }),
-    }), "withdraw");
+    }), "withdraw", true);
 }
 function repay(client, amount) {
     return new services_1.TransactionItem(async () => ({
@@ -78,7 +78,7 @@ function repay(client, amount) {
     }), "repay");
 }
 function rebalance(client, targetLiqUtilizationRateBps) {
-    return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError).buildRebalanceTx(attemptNum), "rebalance");
+    return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError).buildRebalanceTx(attemptNum), "rebalance", true);
 }
 function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
     return [

package/dist/utils/switchboardUtils.d.ts

@@ -9,4 +9,5 @@ export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKe
     price: number;
     stale: boolean;
 }[]>;
+export declare function isSwitchboardMint(mint: PublicKey | string): boolean;
 //# sourceMappingURL=switchboardUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAIjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsB5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA6B5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}

package/dist/utils/switchboardUtils.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
+exports.isSwitchboardMint = isSwitchboardMint;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -58,6 +59,12 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
     if (!pullIx) {
         throw new Error("Unable to fetch SWB crank IX");
     }
+    const price = responses[0].value.toNumber();
+    constants_1.PRICES[mint.toString()] = {
+        realtimePrice: price,
+        emaPrice: price,
+        time: (0, generalUtils_1.currentUnixSeconds)(),
+    };
     return {
         tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIx)]),
         lookupTableAddresses: responses
@@ -79,3 +86,6 @@ async function getSwitchboardFeedData(conn, mints) {
     }));
     return results;
 }
+function isSwitchboardMint(mint) {
+    return Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
+}

package/local/txSandbox.ts

@@ -2,6 +2,7 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  ClientTransactionsManager,
   consoleLog,
   getBatches,
   getClient,
@@ -18,11 +19,10 @@ import {
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
   TransactionItem,
-  TransactionsManager,
 } from "../src";
 import { getSecretKey } from "./shared";
 
-const payForTransaction = true;
+const payForTransaction = false;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
@@ -46,9 +46,9 @@ export async function main() {
     lpEnv,
   });
 
-  await client.initialize({
-    positionId: 3,
-    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
+  await client.initializeExistingSolautoPosition({
+    positionId: 1,
+    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
@@ -56,16 +56,13 @@ export async function main() {
 
   const transactionItems = [rebalance(client)];
 
-  const txManager = new TransactionsManager(
-    client,
-    undefined,
-    payForTransaction ? "normal" : "only-simulate",
-    PriorityFeeSetting.High,
-    true,
-    undefined,
-    { totalRetries: 5 }
-  );
-  const statuses = await txManager.clientSend(transactionItems);
+  const txManager = new ClientTransactionsManager({
+    txHandler: client,
+    txRunType: payForTransaction ? "normal" : "only-simulate",
+    priorityFeeSetting: PriorityFeeSetting.Default,
+    retryConfig: { totalRetries: 5 },
+  });
+  const statuses = await txManager.send(transactionItems);
   consoleLog(statuses);
 }
 
@@ -104,15 +101,12 @@ async function refreshAll() {
   const txBatches = getBatches(transactionItems, 15);
 
   for (const batch of txBatches) {
-    const txManager = new TransactionsManager(
-      client!,
-      undefined,
-      payForTransaction ? "normal" : "only-simulate",
-      PriorityFeeSetting.High,
-      true,
-      undefined,
-      { totalRetries: 5 }
-    );
+    const txManager = new ClientTransactionsManager({
+      txHandler: client!,
+      txRunType: payForTransaction ? "normal" : "only-simulate",
+      priorityFeeSetting: PriorityFeeSetting.Default,
+      retryConfig: { totalRetries: 5 },
+    });
     const statuses = await txManager.send(batch);
     consoleLog(statuses);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.684",
+  "version": "1.0.686",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -23,12 +23,14 @@
     "@switchboard-xyz/common": "=3.0.12",
     "@switchboard-xyz/on-demand": "=1.2.51",
     "axios": "^1.7.8",
+    "big.js": "^6.2.2",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "dotenv": "^16.4.7",
     "rpc-websockets": "7.11.0"
   },
   "devDependencies": {
+    "@types/big.js": "^6.2.2",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.16.11",

package/src/constants/solautoConstants.ts

@@ -31,6 +31,8 @@ export const REFERRER_PERCENTAGE = 0.15;
 
 export const PRICES: { [key: string]: { realtimePrice: number; emaPrice: number; time: number } } = {};
 
+export const CHORES_TX_NAME = "account chores";
+
 export const JITO_TIP_ACCOUNTS = [
   "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
   "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -311,7 +311,7 @@ export class RebalanceTxBuilder {
     );
     consoleLog("Liq utilization rate diff:", utilizationRateDiff);
 
-    if (utilizationRateDiff >= 10) {
+    if (utilizationRateDiff >= 5) {
       consoleLog("Refreshing before rebalance");
       return true;
     }

package/src/services/solauto/solautoClient.ts

@@ -48,6 +48,26 @@ export interface SolautoClientArgs extends ReferralStateManagerArgs {
   lpUserAccount?: PublicKey;
 }
 
+export type ExistingSolautoPositionArgs = Required<
+  Pick<SolautoClientArgs, "positionId">
+> &
+  Partial<Pick<SolautoClientArgs, "authority">>;
+
+export type NewSolautoPositionArgs = Required<
+  Pick<
+    SolautoClientArgs,
+    "positionId" | "supplyMint" | "debtMint" | "lpPoolAccount"
+  >
+>;
+
+export type ExistingSelfManagedPositionArgs = Required<
+  Pick<SolautoClientArgs, "lpUserAccount">
+>;
+
+export type NewSelfManagedPositionArgs = Required<
+  Pick<SolautoClientArgs, "supplyMint" | "debtMint" | "lpPoolAccount">
+>;
+
 export abstract class SolautoClient extends ReferralStateManager {
   public lendingPlatform!: LendingPlatform;
   public lpEnv!: ProgramEnv;
@@ -73,6 +93,24 @@ export abstract class SolautoClient extends ReferralStateManager {
   private signerSupplyBalance: bigint | undefined;
   private signerDebtBalance: bigint | undefined;
 
+  async initializeExistingSolautoPosition(args: ExistingSolautoPositionArgs) {
+    await this.initialize(args);
+  }
+
+  async initializeNewSolautoPosition(args: NewSolautoPositionArgs) {
+    await this.initialize(args);
+  }
+
+  async initializeExistingSelfManagedPosition(
+    args: ExistingSelfManagedPositionArgs
+  ) {
+    await this.initialize(args);
+  }
+
+  async initializeNewSelfManagedPosition(args: NewSelfManagedPositionArgs) {
+    await this.initialize(args);
+  }
+
   async initialize(args: SolautoClientArgs) {
     await super.initialize(args);
 

package/src/services/transactions/index.ts

@@ -1,2 +1,3 @@
-export * from './transactionsManager';
-export * from './transactionUtils';
+export * from "./manager";
+export * from "./types";
+export * from "./transactionUtils";

package/src/services/transactions/manager/clientTransactionsManager.ts

@@ -0,0 +1,141 @@
+import {
+  transactionBuilder,
+  TransactionBuilder,
+} from "@metaplex-foundation/umi";
+import { SolautoClient } from "../../solauto";
+import { TransactionsManager } from "./transactionsManager";
+import {
+  buildSwbSubmitResponseTx,
+  isSwitchboardMint,
+  retryWithExponentialBackoff,
+} from "../../../utils";
+import { TransactionItem } from "../types";
+import { getTransactionChores } from "../transactionUtils";
+import { CHORES_TX_NAME } from "../../../constants";
+
+export class ClientTransactionsManager extends TransactionsManager<SolautoClient> {
+  private async updateLut(tx: TransactionBuilder, newLut: boolean) {
+    const lutInputs = await this.lookupTables.getLutInputs();
+    const updateLutTxName = `${newLut ? "create" : "update"} lookup table`;
+    await 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();
+  }
+
+  private async addSwbOraclePullTxs(txs: TransactionItem[]) {
+    const switchboardMints = [
+      ...(isSwitchboardMint(this.txHandler.pos.supplyMint)
+        ? [this.txHandler.pos.supplyMint]
+        : []),
+      ...(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 TransactionItem(
+            async () =>
+              buildSwbSubmitResponseTx(
+                this.txHandler.connection,
+                this.txHandler.signer,
+                x
+              ),
+            this.updateOracleTxName
+          )
+      );
+      txs.unshift(...txs);
+    }
+  }
+
+  private async addChoreTxs(
+    txs: TransactionItem[],
+    updateLutTx?: TransactionBuilder
+  ) {
+    let [choresBefore, choresAfter] = await getTransactionChores(
+      this.txHandler,
+      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 TransactionItem(
+        async () => ({ tx: choresBefore }),
+        CHORES_TX_NAME
+      );
+      await chore.initialize();
+      txs.unshift(chore);
+      this.txHandler.log(
+        "Chores before: ",
+        choresBefore.getInstructions().length
+      );
+    }
+
+    if (choresAfter.getInstructions().length) {
+      const chore = new TransactionItem(
+        async () => ({ tx: choresAfter }),
+        CHORES_TX_NAME
+      );
+      await chore.initialize();
+      txs.push(chore);
+      this.txHandler.log(
+        "Chores after: ",
+        choresAfter.getInstructions().length
+      );
+    }
+  }
+
+  public async send(transactions: TransactionItem[]) {
+    const items = [...transactions];
+    const client = this.txHandler as SolautoClient;
+
+    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;
+  }
+}

package/src/services/transactions/manager/index.ts

@@ -0,0 +1,2 @@
+export * from "./transactionsManager";
+export * from "./clientTransactionsManager";