@haven-fi/solauto-sdk 1.0.42 → 1.0.44

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAG7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAG7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -261,7 +261,6 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const needDebtAccounts = (!inputIsSupply && rebalanceStep === "A") ||
             (!outputIsSupply && rebalanceStep === "B") ||
             (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
-        console.log(rebalanceStep, needDebtAccounts);
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAGvB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAK/B,cAAM,YAAY;IAIJ,OAAO,CAAC,MAAM;IAH1B,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,KAAK,EAAE,uBAAuB,EAAE,CAAM;gBAElB,MAAM,EAAE,aAAa;IAInC,YAAY,CAChB,mBAAmB,EAAE,MAAM,EAAE,GAC5B,OAAO,CAAC,uBAAuB,EAAE,CAAC;CAqBtC;AAED,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAED,cAAM,cAAc;IAEhB,OAAO,CAAC,MAAM;IACP,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,eAAe,EAAE;gBAFvB,MAAM,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,KAAK,GAAE,eAAe,EAAO;IAGhC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,GAAG,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAMzB,UAAU,CAAC,UAAU,EAAE,MAAM;IAO7B,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAYzD,YAAY,IAAI,MAAM,EAAE;IAMxB,IAAI,IAAI,MAAM;CAYf;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IA0CrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAiB9D,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,kBAAkB;IA6B7D,IAAI;CAyJX"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAGvB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAK/B,cAAM,YAAY;IAIJ,OAAO,CAAC,MAAM;IAH1B,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,KAAK,EAAE,uBAAuB,EAAE,CAAM;gBAElB,MAAM,EAAE,aAAa;IAInC,YAAY,CAChB,mBAAmB,EAAE,MAAM,EAAE,GAC5B,OAAO,CAAC,uBAAuB,EAAE,CAAC;CAqBtC;AAED,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAED,cAAM,cAAc;IAEhB,OAAO,CAAC,MAAM;IACP,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,eAAe,EAAE;gBAFvB,MAAM,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,KAAK,GAAE,eAAe,EAAO;IAGhC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,GAAG,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAMzB,UAAU,CAAC,UAAU,EAAE,MAAM;IAO7B,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAYzD,YAAY,IAAI,MAAM,EAAE;IAMxB,IAAI,IAAI,MAAM;CAYf;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IA0CrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAiB9D,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,kBAAkB;IAsB7D,IAAI;CAyJX"}

package/dist/transactions/transactionsManager.js

@@ -191,13 +191,12 @@ class TransactionsManager {
         for (const ix of tx.getInstructions()) {
             const ixAccounts = ix.keys.map((x) => x.pubkey);
             const accountsNotInLut = ixAccounts.filter((x) => !lutAccounts.includes(x));
-            console.log("Program", ix.programId, " data ", ix.data.length, ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3);
+            this.client.log(`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) {
-                console.log("Accounts not in LUT:");
+                this.client.log(`${accountsNotInLut.length} accounts not in LUT:`);
                 for (const key of accountsNotInLut) {
-                    console.log(key.toString());
+                    this.client.log(key.toString());
                 }
-                console.log(ix.keys.length);
             }
         }
     }
@@ -290,7 +289,7 @@ class TransactionsManager {
                         const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, tx, this.simulateOnly, attemptNum);
                         this.updateStatus(itemSet.name(), TransactionStatus.Successful, txSig ? bs58_1.default.encode(txSig) : undefined);
                     }
-                }, 3, 150, this.errorsToThrow);
+                }, 4, 150, this.errorsToThrow);
             }
         }
         if (!this.simulateOnly) {

package/dist/utils/generalUtils.js

@@ -94,7 +94,7 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
                     return;
                 }
                 if (attemptNum < retries) {
-                    console.log(error.message);
+                    console.log(error);
                     setTimeout(() => {
                         console.log("Retrying...");
                         return attempt(attemptNum);

package/dist/utils/jupiterUtils.js

@@ -34,7 +34,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
         slippageBps: 10,
         maxAccounts: 60,
     }), 3);
-    const finalPriceSlippageBps = Math.round(Math.max(quoteResponse.slippageBps ?? 10, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct)))) *
+    const finalPriceSlippageBps = Math.round(Math.max(quoteResponse.slippageBps, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1) *
         (1 + (swapDetails.slippageBpsIncFactor ?? 0)));
     quoteResponse.slippageBps = finalPriceSlippageBps;
     console.log(quoteResponse);

package/dist/utils/marginfiUtils.d.ts

@@ -8,7 +8,13 @@ export declare function findMarginfiAccounts({ mint, bank, }: {
     mint?: string;
     bank?: string;
 }): MarginfiAssetAccounts;
-export declare function getMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank | null, supplyPrice?: number): Promise<[number, number]>;
+export declare function getMaxLtvAndLiqThreshold(umi: Umi, supply: {
+    mint: PublicKey;
+    bank: Bank | null;
+}, debt: {
+    mint: PublicKey;
+    bank: Bank | null;
+}, supplyPrice?: number): Promise<[number, number]>;
 export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
     marginfiAccount: PublicKey;
     supplyMint?: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,GAAG,IAAI,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CA6CA;AA0DD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACnB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACnB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -24,23 +24,35 @@ function findMarginfiAccounts({ mint, bank, }) {
     throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
 }
 exports.findMarginfiAccounts = findMarginfiAccounts;
-async function getMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice) {
+async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
+    if (!supply.bank) {
+        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
+            mint: supply.mint.toString(),
+        }).bank));
+    }
+    if (!debt.bank && !debt.mint.equals(web3_js_1.PublicKey.default)) {
+        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
+            mint: debt.mint.toString(),
+        }).bank));
+    }
     if (!supplyPrice) {
-        const [price] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint)]);
+        const [price] = await (0, generalUtils_1.getTokenPrices)([
+            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supply.bank.mint),
+        ]);
         supplyPrice = price;
     }
-    if (debtBank === null) {
+    if (debt.bank === null) {
         return [0, 0];
     }
-    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
-        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightInit.value);
-    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightMaint.value) /
-        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightMaint.value);
-    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supplyBank.totalAssetShares.value) *
-        (0, numberUtils_1.bytesToI80F48)(supplyBank.assetShareValue.value))), supplyBank.mintDecimals) * supplyPrice;
-    if (supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
-        totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit) {
-        const discount = Number(supplyBank.config.totalAssetValueInitLimit) /
+    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supply.bank.config.assetWeightInit.value) /
+        (0, numberUtils_1.bytesToI80F48)(debt.bank.config.liabilityWeightInit.value);
+    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supply.bank.config.assetWeightMaint.value) /
+        (0, numberUtils_1.bytesToI80F48)(debt.bank.config.liabilityWeightMaint.value);
+    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supply.bank.totalAssetShares.value) *
+        (0, numberUtils_1.bytesToI80F48)(supply.bank.assetShareValue.value))), supply.bank.mintDecimals) * supplyPrice;
+    if (supply.bank.config.totalAssetValueInitLimit !== BigInt(0) &&
+        totalDepositedUsdValue > supply.bank.config.totalAssetValueInitLimit) {
+        const discount = Number(supply.bank.config.totalAssetValueInitLimit) /
             totalDepositedUsdValue;
         maxLtv = Math.round(maxLtv * Number(discount));
     }
@@ -106,13 +118,16 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
         decimals: bank?.mintDecimals ?? 0,
         amountUsed: {
             baseUnit: BigInt(Math.round(amountUsed)),
-            baseAmountUsdValue: bank ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
-                marketPrice, generalAccounts_1.USD_DECIMALS) : BigInt(0),
+            baseAmountUsdValue: bank
+                ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
+                    marketPrice, generalAccounts_1.USD_DECIMALS)
+                : BigInt(0),
         },
         amountCanBeUsed: {
             baseUnit: BigInt(Math.round(amountCanBeUsed)),
-            baseAmountUsdValue: bank ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountCanBeUsed)), bank.mintDecimals) *
-                marketPrice, generalAccounts_1.USD_DECIMALS) : BigInt(0),
+            baseAmountUsdValue: bank
+                ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountCanBeUsed)), bank.mintDecimals) * marketPrice, generalAccounts_1.USD_DECIMALS)
+                : BigInt(0),
         },
         baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(marketPrice, generalAccounts_1.USD_DECIMALS),
         flashLoanFeeBps: 0,
@@ -169,7 +184,13 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
         debtUsage = await getTokenUsage(umi, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
     const supplyPrice = solautoConstants_1.PRICES[supplyMint.toString()].price;
-    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice);
+    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, {
+        mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
+        bank: supplyBank,
+    }, {
+        mint: debtBank ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint) : web3_js_1.PublicKey.default,
+        bank: debtBank,
+    }, supplyPrice);
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(supplyUsage.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     const debtUsd = (0, numberUtils_1.fromBaseUnit)(debtUsage?.amountUsed?.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS);
     return {

package/dist/utils/solauto/generalUtils.js

@@ -210,7 +210,7 @@ exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
 async function positionStateWithLatestPrices(umi, state, protocolAccount, lendingPlatform) {
     if ((0, generalUtils_1.currentUnixSeconds)() - Number(state.lastUpdated) > 60 * 60 * 24 * 7) {
         if (lendingPlatform === generated_1.LendingPlatform.Marginfi) {
-            return await (0, marginfiUtils_1.getMarginfiAccountPositionState)(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint), protocolAccount);
+            return await (0, marginfiUtils_1.getMarginfiAccountPositionState)(umi, protocolAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint));
         }
         else {
             throw new Error("Lending platorm not yet supported");

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -409,7 +409,6 @@ export class SolautoMarginfiClient extends SolautoClient {
       (!outputIsSupply && rebalanceStep === "B") ||
       (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
 
-    console.log(rebalanceStep, needDebtAccounts);
     return marginfiRebalance(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),

package/src/transactions/transactionsManager.ts

@@ -265,19 +265,12 @@ export class TransactionsManager {
       const accountsNotInLut = ixAccounts.filter(
         (x) => !lutAccounts.includes(x)
       );
-      console.log(
-        "Program",
-        ix.programId,
-        " data ",
-        ix.data.length,
-        ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3
-      );
+      this.client.log(`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) {
-        console.log("Accounts not in LUT:");
+        this.client.log(`${accountsNotInLut.length} accounts not in LUT:`);
         for (const key of accountsNotInLut) {
-          console.log(key.toString());
+          this.client.log(key.toString());
         }
-        console.log(ix.keys.length);
       }
     }
   }
@@ -424,7 +417,7 @@ export class TransactionsManager {
               );
             }
           },
-          3,
+          4,
           150,
           this.errorsToThrow
         );

package/src/utils/generalUtils.ts

@@ -121,7 +121,7 @@ export function retryWithExponentialBackoff<T>(
           }
 
           if (attemptNum < retries) {
-            console.log(error.message);
+            console.log(error);
             setTimeout(() => {
               console.log("Retrying...");
               return attempt(attemptNum);

package/src/utils/jupiterUtils.ts

@@ -73,8 +73,8 @@ export async function getJupSwapTransaction(
 
   const finalPriceSlippageBps = Math.round(
     Math.max(
-      quoteResponse.slippageBps ?? 10,
-      Math.round(toBps(parseFloat(quoteResponse.priceImpactPct)))
+      quoteResponse.slippageBps,
+      Math.round(toBps(parseFloat(quoteResponse.priceImpactPct))) + 1
     ) *
       (1 + (swapDetails.slippageBpsIncFactor ?? 0))
   );

package/src/utils/marginfiUtils.ts

@@ -43,42 +43,73 @@ export function findMarginfiAccounts({
 }
 
 export async function getMaxLtvAndLiqThreshold(
-  supplyBank: Bank,
-  debtBank: Bank | null,
+  umi: Umi,
+  supply: {
+    mint: PublicKey;
+    bank: Bank | null;
+  },
+  debt: {
+    mint: PublicKey;
+    bank: Bank | null;
+  },
   supplyPrice?: number
 ): Promise<[number, number]> {
+  if (!supply.bank) {
+    supply.bank = await safeFetchBank(
+      umi,
+      publicKey(
+        findMarginfiAccounts({
+          mint: supply.mint.toString(),
+        }).bank
+      )
+    );
+  }
+
+  if (!debt.bank && !debt.mint.equals(PublicKey.default)) {
+    debt.bank = await safeFetchBank(
+      umi,
+      publicKey(
+        findMarginfiAccounts({
+          mint: debt.mint.toString(),
+        }).bank
+      )
+    );
+  }
+
   if (!supplyPrice) {
-    const [price] = await getTokenPrices([toWeb3JsPublicKey(supplyBank.mint)]);
+    const [price] = await getTokenPrices([
+      toWeb3JsPublicKey(supply.bank!.mint),
+    ]);
     supplyPrice = price;
   }
 
-  if (debtBank === null) {
+  if (debt.bank === null) {
     return [0, 0];
   }
 
   let maxLtv =
-    bytesToI80F48(supplyBank.config.assetWeightInit.value) /
-    bytesToI80F48(debtBank.config.liabilityWeightInit.value);
+    bytesToI80F48(supply.bank!.config.assetWeightInit.value) /
+    bytesToI80F48(debt.bank.config.liabilityWeightInit.value);
   const liqThreshold =
-    bytesToI80F48(supplyBank.config.assetWeightMaint.value) /
-    bytesToI80F48(debtBank.config.liabilityWeightMaint.value);
+    bytesToI80F48(supply.bank!.config.assetWeightMaint.value) /
+    bytesToI80F48(debt.bank.config.liabilityWeightMaint.value);
 
   const totalDepositedUsdValue =
     fromBaseUnit(
       BigInt(
         Math.round(
-          bytesToI80F48(supplyBank!.totalAssetShares.value) *
-            bytesToI80F48(supplyBank!.assetShareValue.value)
+          bytesToI80F48(supply.bank!.totalAssetShares.value) *
+            bytesToI80F48(supply.bank!.assetShareValue.value)
         )
       ),
-      supplyBank!.mintDecimals
+      supply.bank!.mintDecimals
     ) * supplyPrice!;
   if (
-    supplyBank!.config.totalAssetValueInitLimit !== BigInt(0) &&
-    totalDepositedUsdValue > supplyBank!.config.totalAssetValueInitLimit
+    supply.bank!.config.totalAssetValueInitLimit !== BigInt(0) &&
+    totalDepositedUsdValue > supply.bank!.config.totalAssetValueInitLimit
   ) {
     const discount =
-      Number(supplyBank!.config.totalAssetValueInitLimit) /
+      Number(supply.bank!.config.totalAssetValueInitLimit) /
       totalDepositedUsdValue;
     maxLtv = Math.round(maxLtv * Number(discount));
   }
@@ -158,7 +189,7 @@ async function getTokenUsage(
     );
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
-  
+
     const totalDeposited =
       bytesToI80F48(bank.totalAssetShares.value) * assetShareValue;
     amountCanBeUsed = isAsset
@@ -172,19 +203,25 @@ async function getTokenUsage(
     decimals: bank?.mintDecimals ?? 0,
     amountUsed: {
       baseUnit: BigInt(Math.round(amountUsed)),
-      baseAmountUsdValue: bank ? toBaseUnit(
-        fromBaseUnit(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
-          marketPrice,
-        USD_DECIMALS
-      ) : BigInt(0),
+      baseAmountUsdValue: bank
+        ? toBaseUnit(
+            fromBaseUnit(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
+              marketPrice,
+            USD_DECIMALS
+          )
+        : BigInt(0),
     },
     amountCanBeUsed: {
       baseUnit: BigInt(Math.round(amountCanBeUsed)),
-      baseAmountUsdValue: bank ? toBaseUnit(
-        fromBaseUnit(BigInt(Math.round(amountCanBeUsed)), bank.mintDecimals) *
-          marketPrice,
-        USD_DECIMALS
-      ) : BigInt(0),
+      baseAmountUsdValue: bank
+        ? toBaseUnit(
+            fromBaseUnit(
+              BigInt(Math.round(amountCanBeUsed)),
+              bank.mintDecimals
+            ) * marketPrice,
+            USD_DECIMALS
+          )
+        : BigInt(0),
     },
     baseAmountMarketPriceUsd: toBaseUnit(marketPrice, USD_DECIMALS),
     flashLoanFeeBps: 0,
@@ -211,18 +248,14 @@ export async function getMarginfiAccountPositionState(
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(
-            findMarginfiAccounts({ mint: supplyMint.toString() }).bank
-          )
+          publicKey(findMarginfiAccounts({ mint: supplyMint.toString() }).bank)
         )
       : null;
   let debtBank: Bank | null =
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(
-            findMarginfiAccounts({ mint: debtMint.toString() }).bank
-          )
+          publicKey(findMarginfiAccounts({ mint: debtMint.toString() }).bank)
         )
       : null;
 
@@ -306,8 +339,15 @@ export async function getMarginfiAccountPositionState(
 
   const supplyPrice = PRICES[supplyMint!.toString()].price;
   let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
-    supplyBank,
-    debtBank,
+    umi,
+    {
+      mint: toWeb3JsPublicKey(supplyBank.mint),
+      bank: supplyBank,
+    },
+    {
+      mint: debtBank ? toWeb3JsPublicKey(debtBank.mint) : PublicKey.default,
+      bank: debtBank,
+    },
     supplyPrice
   );
   const supplyUsd = fromBaseUnit(

package/src/utils/solauto/generalUtils.ts

@@ -326,9 +326,9 @@ export async function positionStateWithLatestPrices(
     if (lendingPlatform === LendingPlatform.Marginfi) {
       return await getMarginfiAccountPositionState(
         umi,
+        protocolAccount,
         toWeb3JsPublicKey(state.supply.mint),
         toWeb3JsPublicKey(state.debt.mint),
-        protocolAccount
       );
     } else {
       throw new Error("Lending platorm not yet supported");

package/tests/transactions/solautoMarginfi.ts

@@ -111,7 +111,7 @@ describe("Solauto Marginfi tests", async () => {
     //     };
     //   }, "deposit")
     // );
-
+    
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>