@haven-fi/solauto-sdk 1.0.813 → 1.0.815

package/dist/constants/solautoConstants.d.ts

@@ -20,5 +20,6 @@ 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[];
+export declare const UPDATE_ORACLE_TX_NAME = "update oracle";
 export {};
 //# sourceMappingURL=solautoConstants.d.ts.map

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,UAAU,UAAU;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAO,CAAC;AAExD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,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,UAAU,UAAU;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAO,CAAC;AAExD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAE3B,eAAO,MAAM,qBAAqB,kBAAkB,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.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;
+exports.UPDATE_ORACLE_TX_NAME = 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");
@@ -39,3 +39,4 @@ exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
     jupiter_1.JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
+exports.UPDATE_ORACLE_TX_NAME = "update oracle";

package/dist/generated/instructions/marginfiProtocolInteraction.js

@@ -58,7 +58,7 @@ function marginfiProtocolInteraction(context, input) {
         },
         marginfiGroup: {
             index: 7,
-            isWritable: false,
+            isWritable: true,
             value: input.marginfiGroup ?? null,
         },
         marginfiAccount: {

package/dist/generated/instructions/marginfiRebalance.js

@@ -82,7 +82,7 @@ function marginfiRebalance(context, input) {
         },
         marginfiGroup: {
             index: 10,
-            isWritable: false,
+            isWritable: true,
             value: input.marginfiGroup ?? null,
         },
         marginfiAccount: {

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

@@ -3,7 +3,6 @@ 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>;
 }

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

@@ -1 +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;AAO5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YAwCnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}
+{"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;AAQ5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}

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

@@ -14,26 +14,6 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
         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("Checking if oracle update(s) needed...");
-            const staleOracles = (await (0, utils_1.getSwitchboardFeedData)(this.txHandler.connection, switchboardMints)).filter((x) => x.stale).length > 0;
-            if (staleOracles) {
-                this.txHandler.log("Requires oracle update(s)...");
-                const oracleTxs = switchboardMints.map((x) => new types_1.TransactionItem(async () => await (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
-                this.txHandler.log("Set crank IXs in TX");
-                txs.unshift(...oracleTxs);
-            }
-        }
-    }
     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)
@@ -63,7 +43,7 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
             await this.updateLut(updateLut.tx, updateLut.new);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
-        await this.addSwbOraclePullTxs(items);
+        // await addSwbOraclePullTxs(this.txHandler, items);
         for (const item of items) {
             await item.initialize();
         }

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

@@ -50,7 +50,6 @@ export declare class TransactionsManager<T extends TxHandler> {
     protected totalRetries: number;
     protected retryDelay: number;
     protected abortController?: AbortController;
-    updateOracleTxName: string;
     constructor(args: TransactionsManagerArgs<T>);
     private assembleTransactionSets;
     private updateStatus;

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

@@ -1 +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,WAAW,wBAAwB;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;AAED,MAAM,MAAM,0BAA0B,GAAG,wBAAwB,EAAE,CAAC;AAEpE,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,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;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;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;IAC7B,SAAS,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE5C,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAoB9B,uBAAuB;IA2CrC,OAAO,CAAC,YAAY;YA+BN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAkBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;IAoCtC,OAAO,CAAC,mBAAmB;YA0Bb,eAAe;YAkDf,6BAA6B;YAyC7B,cAAc;YA0Ed,qBAAqB;cAuDnB,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;IAqChC,OAAO,CAAC,gBAAgB;CAqCzB"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"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"}

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

@@ -10,6 +10,10 @@ const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const transactionUtils_1 = require("../transactionUtils");
 const types_2 = require("../types");
+const constants_1 = require("../../../constants");
+const utils_2 = require("../../../utils");
+// Buffer for Jito tip instruction that will be added later
+const JITO_TIP_BUFFER_BYTES = 75;
 class TransactionTooLargeError extends Error {
     constructor(message) {
         super(message);
@@ -29,7 +33,6 @@ var TransactionStatus;
 class TransactionsManager {
     constructor(args) {
         this.statuses = [];
-        this.updateOracleTxName = "update oracle";
         this.txHandler = args.txHandler;
         this.statusCallback = args.statusCallback;
         this.txRunType = args.txRunType;
@@ -54,9 +57,10 @@ class TransactionsManager {
             if (!item.tx) {
                 continue;
             }
-            const transaction = item.tx.setAddressLookupTables(await this.lookupTables.getLutInputs(item.lookupTableAddresses));
-            if (!transaction.fitsInOneTransaction(this.txHandler.umi)) {
-                throw new TransactionTooLargeError(`Exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`);
+            const transaction = (0, utils_2.addTxOptimizations)(this.txHandler.umi, item.tx, 1, 1).setAddressLookupTables(await this.lookupTables.getLutInputs(item.lookupTableAddresses));
+            // Check if transaction fits with buffer for Jito tip instruction
+            if (!(0, types_2.fitsInOneTransactionWithBuffer)(transaction, this.txHandler.umi, JITO_TIP_BUFFER_BYTES)) {
+                throw new TransactionTooLargeError(`Exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)} + ~${JITO_TIP_BUFFER_BYTES} bytes for Jito tip)`);
             }
             else {
                 let newSet = new types_2.TransactionSet(this.txHandler, this.lookupTables, [
@@ -102,7 +106,9 @@ class TransactionsManager {
                 this.statuses.push(args);
             }
         }
-        (0, utils_1.consoleLog)(`${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`);
+        (0, utils_1.consoleLog)(`${args.name} ${args.attemptNum} is ${args.status
+            .toString()
+            .toLowerCase()}`);
         this.statusCallback?.([...this.statuses]);
     }
     async debugAccounts(itemSet, tx) {
@@ -171,7 +177,7 @@ class TransactionsManager {
         }
         const newItemSetNames = itemSets.flatMap((x) => x.items.map((y) => y.name ?? ""));
         if (newItemSetNames.length === 1 &&
-            newItemSetNames[0] === this.updateOracleTxName) {
+            newItemSetNames[0] === constants_1.UPDATE_ORACLE_TX_NAME) {
             (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
             this.updateStatusForSets(itemSets.map((x) => x.name()), {
                 status: TransactionStatus.Skipped,

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

@@ -1,7 +1,8 @@
-import { AddressLookupTableInput, TransactionBuilder } from "@metaplex-foundation/umi";
+import { AddressLookupTableInput, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { TxHandler } from "../../solauto";
 import { LookupTables } from "./lookupTables";
 import { TransactionItem } from "./transactionItem";
+export declare function fitsInOneTransactionWithBuffer(tx: TransactionBuilder, umi: Umi, extraBuffer?: number): boolean;
 export declare class TransactionSet {
     private txHandler;
     lookupTables: LookupTables;

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

@@ -1 +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"}
+{"version":3,"file":"transactionSet.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/types/transactionSet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAEvB,kBAAkB,EAClB,GAAG,EACJ,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;AAUpD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,kBAAkB,EACtB,GAAG,EAAE,GAAG,EACR,WAAW,GAAE,MAAU,GACtB,OAAO,CAIT;AAED,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;IAiCvD,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

@@ -1,10 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionSet = void 0;
+exports.fitsInOneTransactionWithBuffer = fitsInOneTransactionWithBuffer;
 const umi_1 = require("@metaplex-foundation/umi");
 const utils_1 = require("../../../utils");
 const constants_1 = require("../../../constants");
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
+// Buffer for Jito tip instruction (~44 bytes) + potential new accounts in message
+// This accounts for: System Transfer instruction data, Jito tip account (if new), etc.
+const JITO_TIP_BUFFER_BYTES = 75;
+function fitsInOneTransactionWithBuffer(tx, umi, extraBuffer = 0) {
+    const MAX_TX_SIZE = 1232;
+    const size = tx.getTransactionSize(umi);
+    return size + extraBuffer <= MAX_TX_SIZE;
+}
 class TransactionSet {
     constructor(txHandler, lookupTables, items = []) {
         this.txHandler = txHandler;
@@ -34,7 +43,8 @@ class TransactionSet {
             ...this.lutAddresses(),
             ...item.lookupTableAddresses,
         ]));
-        return tx.fitsInOneTransaction(this.txHandler.umi);
+        // Account for Jito tip instruction that will be added later
+        return fitsInOneTransactionWithBuffer(tx, this.txHandler.umi, JITO_TIP_BUFFER_BYTES);
     }
     add(...items) {
         this.items.push(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));

package/dist/solautoPosition/positionUtils.js

@@ -15,7 +15,7 @@ function createSolautoSettings(settings) {
         boostToBps: settings.boostToBps,
         repayGap: settings.repayGap,
         repayToBps: settings.repayToBps,
-        padding: [],
+        padding: new Array(24).fill(0),
     };
 }
 async function getPositionExBulk(umi, publicKeys) {
@@ -86,9 +86,9 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
             borrowFeeBps: 0,
             decimals: supplyDecimals,
             mint: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(supply.mint),
-            padding1: [],
-            padding2: [],
-            padding: new Uint8Array([]),
+            padding1: new Array(5).fill(0),
+            padding2: new Array(8).fill(0),
+            padding: new Uint8Array(32),
         },
         debt: {
             amountUsed: {
@@ -103,9 +103,9 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
             borrowFeeBps: 0,
             decimals: debtDecimals,
             mint: (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(debt.mint),
-            padding1: [],
-            padding2: [],
-            padding: new Uint8Array([]),
+            padding1: new Array(5).fill(0),
+            padding2: new Array(8).fill(0),
+            padding: new Uint8Array(32),
         },
         netWorth: {
             baseUnit: supply.price
@@ -116,8 +116,8 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
         maxLtvBps,
         liqThresholdBps,
         lastRefreshed: BigInt((0, utils_1.currentUnixSeconds)()),
-        padding1: [],
-        padding2: [],
-        padding: [],
+        padding1: new Array(6).fill(0),
+        padding2: new Array(4).fill(0),
+        padding: new Array(2).fill(0),
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAiBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAqHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA6G/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAiBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAiGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAqHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAkH/B"}

package/dist/utils/jitoUtils.js

@@ -187,8 +187,9 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
     (0, generalUtils_1.consoleLog)(txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString())));
-    (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
+    (0, generalUtils_1.consoleLog)("Transaction sizes (before tip): ", txs.map((x) => x.getTransactionSize(umi)));
     txs[0] = (0, solanaUtils_1.prependTx)(txs[0], [getTipInstruction(userSigner, 250000)]);
+    (0, generalUtils_1.consoleLog)("Transaction sizes (after tip): ", txs.map((x) => x.getTransactionSize(umi)));
     const latestBlockhash = (await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await umi.rpc.getLatestBlockhash({ commitment: "confirmed" }))).blockhash;
     if (abortController?.signal.aborted) {
         return;

package/dist/utils/marginfi/data.js

@@ -169,9 +169,9 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment, priceT
         },
         baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(marketPrice, constants_1.USD_DECIMALS),
         borrowFeeBps: isAsset ? 0 : (0, numberUtils_1.toBps)(originationFee),
-        padding1: [],
-        padding2: [],
-        padding: new Uint8Array([]),
+        padding1: new Array(5).fill(0),
+        padding2: new Array(8).fill(0),
+        padding: new Uint8Array(32),
     };
 }
 async function getBank(umi, data, marginfiGroup) {
@@ -287,9 +287,9 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
             maxLtvBps,
             liqThresholdBps,
             lastRefreshed: BigInt((0, generalUtils_1.currentUnixSeconds)()),
-            padding1: [],
-            padding2: [],
-            padding: [],
+            padding1: new Array(6).fill(0),
+            padding2: new Array(4).fill(0),
+            padding: new Array(2).fill(0),
         },
     };
 }

package/dist/utils/solautoUtils.js

@@ -278,12 +278,12 @@ class ContextUpdates {
                     ...dca.automation,
                     intervalSeconds: BigInt(dca.automation.intervalSeconds),
                     unixStartDate: BigInt(dca.automation.unixStartDate),
-                    padding: new Uint8Array([]),
-                    padding1: [],
+                    padding: new Uint8Array(32),
+                    padding1: new Array(4).fill(0),
                 },
                 dcaInBaseUnit: BigInt(dca.dcaInBaseUnit),
                 tokenType: dca.tokenType,
-                padding: [],
+                padding: new Array(31).fill(0),
             };
         }
         else if (update.type === "cancellingDca") {

package/dist/utils/switchboardUtils.d.ts

@@ -2,6 +2,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer } from "@metaplex-foundation/umi";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
+import { SolautoClient, TransactionItem } from "../services";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
     gateway: OnDemand.Gateway;
     feed: OnDemand.PullFeed;
@@ -13,4 +14,5 @@ export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKe
     stale: boolean;
 }[]>;
 export declare function isSwitchboardMint(mint: PublicKey | string): boolean;
+export declare function addSwbOraclePullTxs(client: SolautoClient, txs: TransactionItem[]): Promise<void>;
 //# 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;AASjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAmD5C;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"}
+{"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;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAiD5C;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;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}

package/dist/utils/switchboardUtils.js

@@ -37,6 +37,7 @@ exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
 exports.isSwitchboardMint = isSwitchboardMint;
+exports.addSwbOraclePullTxs = addSwbOraclePullTxs;
 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");
@@ -46,6 +47,7 @@ const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
 const common_1 = require("@switchboard-xyz/common");
+const services_1 = require("../services");
 async function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
@@ -68,7 +70,6 @@ async function getPullFeed(conn, mint, wallet) {
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
     const { feed, gateway } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
-    // Try to replicate locally in the lambda docker container
     (0, generalUtils_1.consoleLog)("Fetching crank IX...");
     const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
@@ -120,3 +121,21 @@ async function getSwitchboardFeedData(conn, mints) {
 function isSwitchboardMint(mint) {
     return Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
 }
+async function addSwbOraclePullTxs(client, txs) {
+    const switchboardMints = [
+        ...(isSwitchboardMint(client.pos.supplyMint)
+            ? [client.pos.supplyMint]
+            : []),
+        ...(isSwitchboardMint(client.pos.debtMint) ? [client.pos.debtMint] : []),
+    ];
+    if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+        (0, generalUtils_1.consoleLog)("Checking if oracle update(s) needed...");
+        const staleOracles = (await getSwitchboardFeedData(client.connection, switchboardMints)).filter((x) => x.stale).length > 0;
+        if (staleOracles) {
+            (0, generalUtils_1.consoleLog)("Requires oracle update(s)...");
+            const oracleTxs = switchboardMints.map((x) => new services_1.TransactionItem(async () => await buildSwbSubmitResponseTx(client.connection, client.signer, x), constants_1.UPDATE_ORACLE_TX_NAME));
+            (0, generalUtils_1.consoleLog)("Set crank IXs in TX");
+            txs.unshift(...oracleTxs);
+        }
+    }
+}

package/local/txSandbox.ts

@@ -2,10 +2,13 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  buildSwbSubmitResponseTx,
   ClientTransactionsManager,
   consoleLog,
+  fetchBank,
   getBatches,
   getClient,
+  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
@@ -15,12 +18,16 @@ import {
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
+  safeFetchBank,
+  safeFetchMarginfiAccount,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
   TransactionItem,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
+import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = true;
 const testProgram = false;
@@ -46,15 +53,30 @@ export async function main() {
     lpEnv,
   });
 
-  await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
+  await client.initializeNewSolautoPosition({
+    // positionId: 1,
+    positionId: 99,
+    supplyMint: NATIVE_MINT,
+    debtMint: new PublicKey(USDC),
+    lpPoolAccount: getMarginfiAccounts().defaultGroup,
+    // lpPoolAccount: new PublicKey("GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz")
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  // const transactionItems = [rebalance(client)];
+  const transactionItems: TransactionItem[] = [
+    new TransactionItem(
+      async () =>
+        await buildSwbSubmitResponseTx(
+          client.connection,
+          client.signer,
+          new PublicKey(NATIVE_MINT)
+          // new PublicKey(JITO_SOL)
+        )!
+    ),
+  ];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,

package/package.json

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

package/src/constants/solautoConstants.ts

@@ -65,3 +65,5 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
+
+export const UPDATE_ORACLE_TX_NAME = "update oracle";

package/src/generated/instructions/marginfiProtocolInteraction.ts

@@ -139,7 +139,7 @@ export function marginfiProtocolInteraction(
     },
     marginfiGroup: {
       index: 7,
-      isWritable: false as boolean,
+      isWritable: true as boolean,
       value: input.marginfiGroup ?? null,
     },
     marginfiAccount: {

package/src/generated/instructions/marginfiRebalance.ts

@@ -188,7 +188,7 @@ export function marginfiRebalance(
     },
     marginfiGroup: {
       index: 10,
-      isWritable: false as boolean,
+      isWritable: true as boolean,
       value: input.marginfiGroup ?? null,
     },
     marginfiAccount: {

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

@@ -5,6 +5,7 @@ import {
 import { SolautoClient } from "../../solauto";
 import { TransactionsManager } from "./transactionsManager";
 import {
+  addSwbOraclePullTxs,
   buildSwbSubmitResponseTx,
   getSwitchboardFeedData,
   isSwitchboardMint,
@@ -34,46 +35,6 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     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("Checking if oracle update(s) needed...");
-      const staleOracles =
-        (
-          await getSwitchboardFeedData(
-            this.txHandler.connection,
-            switchboardMints
-          )
-        ).filter((x) => x.stale).length > 0;
-
-      if (staleOracles) {
-        this.txHandler.log("Requires oracle update(s)...");
-        const oracleTxs = switchboardMints.map(
-          (x) =>
-            new TransactionItem(
-              async () =>
-                await buildSwbSubmitResponseTx(
-                  this.txHandler.connection,
-                  this.txHandler.signer,
-                  x
-                ),
-              this.updateOracleTxName
-            )
-        );
-        this.txHandler.log("Set crank IXs in TX");
-        txs.unshift(...oracleTxs);
-      }
-    }
-  }
-
   private async addChoreTxs(
     txs: TransactionItem[],
     updateLutTx?: TransactionBuilder
@@ -131,7 +92,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     }
     this.lookupTables.defaultLuts = client.defaultLookupTables();
 
-    await this.addSwbOraclePullTxs(items);
+    // await addSwbOraclePullTxs(this.txHandler, items);
 
     for (const item of items) {
       await item.initialize();

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

@@ -15,7 +15,17 @@ import {
 } from "../../../utils";
 import { TxHandler } from "../../solauto";
 import { getErrorInfo } from "../transactionUtils";
-import { LookupTables, TransactionItem, TransactionSet } from "../types";
+import {
+  LookupTables,
+  TransactionItem,
+  TransactionSet,
+  fitsInOneTransactionWithBuffer,
+} from "../types";
+import { UPDATE_ORACLE_TX_NAME } from "../../../constants";
+import { addTxOptimizations } from "../../../utils";
+
+// Buffer for Jito tip instruction that will be added later
+const JITO_TIP_BUFFER_BYTES = 75;
 
 export class TransactionTooLargeError extends Error {
   constructor(message: string) {
@@ -75,8 +85,6 @@ export class TransactionsManager<T extends TxHandler> {
   protected retryDelay: number;
   protected abortController?: AbortController;
 
-  updateOracleTxName = "update oracle";
-
   constructor(args: TransactionsManagerArgs<T>) {
     this.txHandler = args.txHandler;
     this.statusCallback = args.statusCallback;
@@ -113,12 +121,26 @@ export class TransactionsManager<T extends TxHandler> {
         continue;
       }
 
-      const transaction = item.tx.setAddressLookupTables(
+      const transaction = addTxOptimizations(
+        this.txHandler.umi,
+        item.tx,
+        1,
+        1
+      ).setAddressLookupTables(
         await this.lookupTables.getLutInputs(item.lookupTableAddresses)
       );
-      if (!transaction.fitsInOneTransaction(this.txHandler.umi)) {
+      // Check if transaction fits with buffer for Jito tip instruction
+      if (
+        !fitsInOneTransactionWithBuffer(
+          transaction,
+          this.txHandler.umi,
+          JITO_TIP_BUFFER_BYTES
+        )
+      ) {
         throw new TransactionTooLargeError(
-          `Exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`
+          `Exceeds max transaction size (${transaction.getTransactionSize(
+            this.txHandler.umi
+          )} + ~${JITO_TIP_BUFFER_BYTES} bytes for Jito tip)`
         );
       } else {
         let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
@@ -166,7 +188,9 @@ export class TransactionsManager<T extends TxHandler> {
       }
     }
     consoleLog(
-      `${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`
+      `${args.name} ${args.attemptNum} is ${args.status
+        .toString()
+        .toLowerCase()}`
     );
     this.statusCallback?.([...this.statuses]);
   }
@@ -180,7 +204,11 @@ export class TransactionsManager<T extends TxHandler> {
         (x) => !lutAccounts.includes(x)
       );
       consoleLog(
-        `Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`
+        `Program ${ix.programId}, data len: ${
+          ix.data.length
+        }, LUT accounts data: ${
+          ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3
+        }`
       );
       if (accountsNotInLut.length > 0) {
         consoleLog(`${accountsNotInLut.length} accounts not in LUT:`);
@@ -273,7 +301,7 @@ export class TransactionsManager<T extends TxHandler> {
     );
     if (
       newItemSetNames.length === 1 &&
-      newItemSetNames[0] === this.updateOracleTxName
+      newItemSetNames[0] === UPDATE_ORACLE_TX_NAME
     ) {
       consoleLog("Skipping unnecessary oracle update");
       this.updateStatusForSets(
@@ -570,7 +598,9 @@ export class TransactionsManager<T extends TxHandler> {
       this.priorityFeeSetting
     );
 
-    const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
+    const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${
+      errorDetails.errorInfo?.split("\n")[0] ?? "unknown"
+    }`;
     const errorInfo =
       errorDetails.errorName || errorDetails.errorInfo
         ? errorString

package/src/services/transactions/types/transactionSet.ts

@@ -2,6 +2,7 @@ import {
   AddressLookupTableInput,
   transactionBuilder,
   TransactionBuilder,
+  Umi,
 } from "@metaplex-foundation/umi";
 import { TxHandler } from "../../solauto";
 import { LookupTables } from "./lookupTables";
@@ -11,6 +12,20 @@ import { CHORES_TX_NAME } from "../../../constants";
 
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
 
+// Buffer for Jito tip instruction (~44 bytes) + potential new accounts in message
+// This accounts for: System Transfer instruction data, Jito tip account (if new), etc.
+const JITO_TIP_BUFFER_BYTES = 75;
+
+export function fitsInOneTransactionWithBuffer(
+  tx: TransactionBuilder,
+  umi: Umi,
+  extraBuffer: number = 0
+): boolean {
+  const MAX_TX_SIZE = 1232;
+  const size = tx.getTransactionSize(umi);
+  return size + extraBuffer <= MAX_TX_SIZE;
+}
+
 export class TransactionSet {
   constructor(
     private txHandler: TxHandler,
@@ -55,7 +70,12 @@ export class TransactionSet {
         ])
       );
 
-    return tx.fitsInOneTransaction(this.txHandler.umi);
+    // Account for Jito tip instruction that will be added later
+    return fitsInOneTransactionWithBuffer(
+      tx,
+      this.txHandler.umi,
+      JITO_TIP_BUFFER_BYTES
+    );
   }
 
   add(...items: TransactionItem[]) {

package/src/solautoPosition/positionUtils.ts

@@ -38,7 +38,7 @@ export function createSolautoSettings(
     boostToBps: settings.boostToBps,
     repayGap: settings.repayGap,
     repayToBps: settings.repayToBps,
-    padding: [],
+    padding: new Array(24).fill(0),
   };
 }
 
@@ -167,9 +167,9 @@ export function createFakePositionState(
       borrowFeeBps: 0,
       decimals: supplyDecimals,
       mint: fromWeb3JsPublicKey(supply.mint),
-      padding1: [],
-      padding2: [],
-      padding: new Uint8Array([]),
+      padding1: new Array(5).fill(0),
+      padding2: new Array(8).fill(0),
+      padding: new Uint8Array(32),
     },
     debt: {
       amountUsed: {
@@ -186,9 +186,9 @@ export function createFakePositionState(
       borrowFeeBps: 0,
       decimals: debtDecimals,
       mint: fromWeb3JsPublicKey(debt.mint),
-      padding1: [],
-      padding2: [],
-      padding: new Uint8Array([]),
+      padding1: new Array(5).fill(0),
+      padding2: new Array(8).fill(0),
+      padding: new Uint8Array(32),
     },
     netWorth: {
       baseUnit: supply.price
@@ -199,8 +199,8 @@ export function createFakePositionState(
     maxLtvBps,
     liqThresholdBps,
     lastRefreshed: BigInt(currentUnixSeconds()),
-    padding1: [],
-    padding2: [],
-    padding: [],
+    padding1: new Array(6).fill(0),
+    padding2: new Array(4).fill(0),
+    padding: new Array(2).fill(0),
   };
 }

package/src/utils/jitoUtils.ts

@@ -82,8 +82,8 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
       {
         encoding: "base64",
         commitment: "confirmed",
-        preExecutionAccountsConfigs: txs.map((_) => {}),
-        postExecutionAccountsConfigs: txs.map((_) => {}),
+        preExecutionAccountsConfigs: txs.map((_) => { }),
+        postExecutionAccountsConfigs: txs.map((_) => { }),
         skipSigVerify: true,
       },
     ]);
@@ -298,12 +298,17 @@ export async function sendJitoBundledTransactions(
     txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString()))
   );
   consoleLog(
-    "Transaction sizes: ",
+    "Transaction sizes (before tip): ",
     txs.map((x) => x.getTransactionSize(umi))
   );
 
   txs[0] = prependTx(txs[0], [getTipInstruction(userSigner, 250_000)]);
 
+  consoleLog(
+    "Transaction sizes (after tip): ",
+    txs.map((x) => x.getTransactionSize(umi))
+  );
+
   const latestBlockhash = (
     await retryWithExponentialBackoff(
       async () => await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })
@@ -334,16 +339,16 @@ export async function sendJitoBundledTransactions(
 
   const feeEstimates = usePriorityFee(priorityFeeSetting)
     ? await Promise.all(
-        txs.map(
-          async (x) =>
-            (await getComputeUnitPriceEstimate(
-              umi,
-              x,
-              priorityFeeSetting,
-              true
-            )) ?? 1000000
-        )
+      txs.map(
+        async (x) =>
+          (await getComputeUnitPriceEstimate(
+            umi,
+            x,
+            priorityFeeSetting,
+            true
+          )) ?? 1000000
       )
+    )
     : undefined;
 
   if (abortController?.signal.aborted) {

package/src/utils/marginfi/data.ts

@@ -288,9 +288,9 @@ async function getTokenUsage(
     },
     baseAmountMarketPriceUsd: toBaseUnit(marketPrice, USD_DECIMALS),
     borrowFeeBps: isAsset ? 0 : toBps(originationFee),
-    padding1: [],
-    padding2: [],
-    padding: new Uint8Array([]),
+    padding1: new Array(5).fill(0),
+    padding2: new Array(8).fill(0),
+    padding: new Uint8Array(32),
   };
 }
 
@@ -513,9 +513,9 @@ export async function getMarginfiAccountPositionState(
       maxLtvBps,
       liqThresholdBps,
       lastRefreshed: BigInt(currentUnixSeconds()),
-      padding1: [],
-      padding2: [],
-      padding: [],
+      padding1: new Array(6).fill(0),
+      padding2: new Array(4).fill(0),
+      padding: new Array(2).fill(0),
     },
   };
 }

package/src/utils/solautoUtils.ts

@@ -403,12 +403,12 @@ export class ContextUpdates {
           ...dca.automation,
           intervalSeconds: BigInt(dca.automation.intervalSeconds),
           unixStartDate: BigInt(dca.automation.unixStartDate),
-          padding: new Uint8Array([]),
-          padding1: [],
+          padding: new Uint8Array(32),
+          padding1: new Array(4).fill(0),
         },
         dcaInBaseUnit: BigInt(dca.dcaInBaseUnit),
         tokenType: dca.tokenType,
-        padding: [],
+        padding: new Array(31).fill(0),
       };
     } else if (update.type === "cancellingDca") {
       this.cancellingDca = update.value;

package/src/utils/switchboardUtils.ts

@@ -9,7 +9,11 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 import Big from "big.js";
-import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
+import {
+  PRICES,
+  SWITCHBOARD_PRICE_FEED_IDS,
+  UPDATE_ORACLE_TX_NAME,
+} from "../constants";
 import { TransactionItemInputs } from "../types";
 import {
   consoleLog,
@@ -18,6 +22,7 @@ import {
 } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
 import { CrossbarClient } from "@switchboard-xyz/common";
+import { SolautoClient, TransactionItem } from "../services";
 
 export async function getPullFeed(
   conn: Connection,
@@ -69,8 +74,6 @@ export async function buildSwbSubmitResponseTx(
     toWeb3JsPublicKey(signer.publicKey)
   );
 
-  // Try to replicate locally in the lambda docker container
-
   consoleLog("Fetching crank IX...");
   const [pullIxs, responses] = await retryWithExponentialBackoff(
     async () => {
@@ -146,3 +149,41 @@ export async function getSwitchboardFeedData(
 export function isSwitchboardMint(mint: PublicKey | string) {
   return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
 }
+
+export async function addSwbOraclePullTxs(
+  client: SolautoClient,
+  txs: TransactionItem[]
+) {
+  const switchboardMints = [
+    ...(isSwitchboardMint(client.pos.supplyMint)
+      ? [client.pos.supplyMint]
+      : []),
+    ...(isSwitchboardMint(client.pos.debtMint) ? [client.pos.debtMint] : []),
+  ];
+
+  if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+    consoleLog("Checking if oracle update(s) needed...");
+    const staleOracles =
+      (
+        await getSwitchboardFeedData(client.connection, switchboardMints)
+      ).filter((x) => x.stale).length > 0;
+
+    if (staleOracles) {
+      consoleLog("Requires oracle update(s)...");
+      const oracleTxs = switchboardMints.map(
+        (x) =>
+          new TransactionItem(
+            async () =>
+              await buildSwbSubmitResponseTx(
+                client.connection,
+                client.signer,
+                x
+              ),
+            UPDATE_ORACLE_TX_NAME
+          )
+      );
+      consoleLog("Set crank IXs in TX");
+      txs.unshift(...oracleTxs);
+    }
+  }
+}