@haven-fi/solauto-sdk 1.0.14 → 1.0.16

package/dist/clients/solautoClient.d.ts

@@ -11,8 +11,8 @@ export interface SolautoClientArgs {
     positionId: number;
     signer?: Signer;
     wallet?: WalletAdapter;
-    supplyLiquidityMint?: PublicKey;
-    debtLiquidityMint?: PublicKey;
+    supplyMint?: PublicKey;
+    debtMint?: PublicKey;
     referralFeesDestMint?: PublicKey;
     referredByAuthority?: PublicKey;
 }
@@ -29,10 +29,10 @@ export declare abstract class SolautoClient {
     solautoPosition: PublicKey;
     solautoPositionData: SolautoPosition | null;
     solautoPositionState: PositionState | undefined;
-    supplyLiquidityMint: PublicKey;
+    supplyMint: PublicKey;
     positionSupplyLiquidityTa: PublicKey;
     signerSupplyLiquidityTa: PublicKey;
-    debtLiquidityMint: PublicKey;
+    debtMint: PublicKey;
     positionDebtLiquidityTa: PublicKey;
     signerDebtLiquidityTa: PublicKey;
     authorityReferralState: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,UAAU,EACV,SAAS,EACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAQJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,yBAAyB,EACzB,gCAAgC,EAChC,sBAAsB,EASvB,MAAM,cAAc,CAAC;AAOtB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAKvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAInE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAE9B,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,8BAAsB,aAAa;IAwC/B,OAAO,CAAC,YAAY;IACb,SAAS,CAAC;IAxCZ,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;IACxB,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IACtB,MAAM,EAAG,MAAM,CAAC;IAEhB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,eAAe,EAAG,SAAS,CAAC;IAC5B,mBAAmB,EAAG,eAAe,GAAG,IAAI,CAAC;IAC7C,oBAAoB,EAAG,aAAa,GAAG,SAAS,CAAC;IAEjD,mBAAmB,EAAG,SAAS,CAAC;IAChC,yBAAyB,EAAG,SAAS,CAAC;IACtC,uBAAuB,EAAG,SAAS,CAAC;IAEpC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,uBAAuB,EAAG,SAAS,CAAC;IACpC,qBAAqB,EAAG,SAAS,CAAC;IAElC,sBAAsB,EAAG,SAAS,CAAC;IACnC,0BAA0B,EAAG,aAAa,GAAG,IAAI,CAAC;IAClD,6BAA6B,EAAG,SAAS,CAAC;IAC1C,uBAAuB,EAAG,SAAS,CAAC;IAEpC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,iBAAiB,EAAG,SAAS,CAAC;IAC9B,mBAAmB,EAAG,SAAS,CAAC;IAEhC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,mBAAmB,EAAG,SAAS,EAAE,CAAC;IAElC,mBAAmB,EAAE,mBAAmB,CAA6B;gBAGlE,YAAY,EAAE,MAAM,EACrB,SAAS,CAAC,qBAAS;IAatB,UAAU,CACd,IAAI,EAAE,iBAAiB,EACvB,eAAe,EAAE,eAAe;IAqHlC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAMnB,wBAAwB;IAoB9B,mBAAmB,IAAI,MAAM,EAAE;IAK/B,gBAAgB,IAAI,SAAS,EAAE;IAiBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAChC;QAAE,WAAW,EAAE,kBAAkB,CAAC;QAAC,iBAAiB,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAC5E;IAwDD,uBAAuB,IAAI,yBAAyB,GAAG,SAAS;IAOhE,wBAAwB,IAAI,WAAW,GAAG,SAAS;IAOnD,sBAAsB,IAAI,kBAAkB;IAiB5C,mBAAmB,IAAI,kBAAkB;IAmBzC,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAuBrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IA2DlE,eAAe,IAAI,kBAAkB;IAWrC,WAAW,IAAI,kBAAkB;IA4BjC,QAAQ,CAAC,OAAO,IAAI,kBAAkB;IAEtC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAuFhE,QAAQ,CAAC,WAAW,CAClB,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IAErB,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAE3E,QAAQ,CAAC,SAAS,CAChB,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IAEf,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAYlE"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoClient.js

@@ -43,16 +43,16 @@ class SolautoClient {
         this.solautoPosition = await (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
         this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
         this.solautoPositionState = this.solautoPositionData?.state;
-        this.supplyLiquidityMint =
-            args.supplyLiquidityMint ??
+        this.supplyMint =
+            args.supplyMint ??
                 (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint);
-        this.positionSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyLiquidityMint);
-        this.signerSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyLiquidityMint);
-        this.debtLiquidityMint =
-            args.debtLiquidityMint ??
+        this.positionSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyMint);
+        this.signerSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint);
+        this.debtMint =
+            args.debtMint ??
                 (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint);
-        this.positionDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtLiquidityMint);
-        this.signerDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtLiquidityMint);
+        this.positionDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
+        this.signerDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
         this.authorityReferralState = await (0, accountUtils_1.getReferralState)(this.authority);
         this.authorityReferralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.authorityReferralState));
         this.authorityReferralFeesDestMint = args.referralFeesDestMint
@@ -61,24 +61,25 @@ class SolautoClient {
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.destFeesMint)
                 : spl_token_1.NATIVE_MINT;
         this.authorityReferralDestTa = (0, accountUtils_1.getTokenAccount)(this.authorityReferralState, this.authorityReferralFeesDestMint);
-        const referredByAuthority = args.referredByAuthority &&
+        const hasReferredBy = this.authorityReferralStateData &&
+            this.authorityReferralStateData.referredByState !==
+                (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
+        const referredByAuthority = !hasReferredBy &&
+            args.referredByAuthority &&
             !args.referredByAuthority.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
             ? args.referredByAuthority
             : undefined;
-        this.referredByState =
-            this.authorityReferralStateData &&
-                this.authorityReferralStateData.referredByState !==
-                    (0, umi_1.publicKey)(web3_js_1.PublicKey.default)
-                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData.referredByState)
-                : referredByAuthority
-                    ? await (0, accountUtils_1.getReferralState)(referredByAuthority)
-                    : undefined;
+        this.referredByState = hasReferredBy
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData.referredByState)
+            : referredByAuthority
+                ? await (0, accountUtils_1.getReferralState)(referredByAuthority)
+                : undefined;
         this.referredByAuthority = referredByAuthority;
         if (this.referredByState !== undefined) {
-            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyLiquidityMint);
+            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyMint);
         }
         this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
-        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyLiquidityMint);
+        this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyMint);
         this.authorityLutAddress = this.authorityReferralStateData?.lookupTable
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.lookupTable)
             : undefined;
@@ -241,7 +242,7 @@ class SolautoClient {
         let positionDebtTa = undefined;
         let signerDebtTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
-            debtMint = (0, umi_1.publicKey)(this.debtLiquidityMint);
+            debtMint = (0, umi_1.publicKey)(this.debtMint);
             positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
             signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
             let addingToPos = false;
@@ -301,7 +302,7 @@ class SolautoClient {
         if (this.solautoPositionData !== null && !this.selfManaged) {
             const positionData = this.solautoPositionData.position;
             if (positionData.dca.debtToAddBaseUnit) {
-                debtMint = (0, umi_1.publicKey)(this.debtLiquidityMint);
+                debtMint = (0, umi_1.publicKey)(this.debtMint);
                 positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
                 signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
                 this.livePositionUpdates.new({

package/dist/clients/solautoMarginfiClient.d.ts

@@ -12,7 +12,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
     marginfiAccountSeedIdx?: bigint;
     marginfiGroup?: PublicKey;
 }
-export declare function newMarginfiSolautoManagedPositionArgs(positionId: number, signer: Signer | undefined, wallet: WalletAdapter | undefined, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
+export declare function newSolautoMarginfiPositionArgs(positionId: number, signer: Signer | undefined, wallet: WalletAdapter | undefined, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
 export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiProgram: PublicKey;
     marginfiAccountSeedIdx?: bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,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,EAQhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,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,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAU3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAuEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,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":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAOnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,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,EAQhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,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,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAiB3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAuEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolautoMarginfiClient = exports.newMarginfiSolautoManagedPositionArgs = void 0;
+exports.SolautoMarginfiClient = exports.newSolautoMarginfiPositionArgs = void 0;
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const umi_1 = require("@metaplex-foundation/umi");
 const web3_js_1 = require("@solana/web3.js");
@@ -12,18 +12,21 @@ const generalUtils_1 = require("../utils/generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const marginfiUtils_1 = require("../utils/marginfiUtils");
 const numberUtils_1 = require("../utils/numberUtils");
-function newMarginfiSolautoManagedPositionArgs(positionId, signer, wallet, supplyMint, debtMint, referredByAuthority) {
+function newSolautoMarginfiPositionArgs(positionId, signer, wallet, supplyMint, debtMint, referredByAuthority) {
     return {
         positionId,
         signer,
         wallet,
+        marginfiAccount: positionId === 0
+            ? (0, umi_1.createSignerFromKeypair)((0, umi_1.createUmi)(), (0, umi_web3js_adapters_1.fromWeb3JsKeypair)(web3_js_1.Keypair.generate()))
+            : undefined,
         marginfiAccountSeedIdx: positionId > 0 ? (0, generalUtils_1.generateRandomU64)() : undefined,
-        supplyLiquidityMint: supplyMint,
-        debtLiquidityMint: debtMint,
+        supplyMint: supplyMint,
+        debtMint: debtMint,
         referredByAuthority,
     };
 }
-exports.newMarginfiSolautoManagedPositionArgs = newMarginfiSolautoManagedPositionArgs;
+exports.newSolautoMarginfiPositionArgs = newSolautoMarginfiPositionArgs;
 class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     async initialize(args) {
         if (args.marginfiAccount) {
@@ -45,10 +48,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccountData.group)
             : args.marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
         this.marginfiSupplyBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
-            mint: this.supplyLiquidityMint.toString(),
+            mint: this.supplyMint.toString(),
         });
         this.marginfiDebtBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
-            mint: this.debtLiquidityMint.toString(),
+            mint: this.debtMint.toString(),
         });
         const existingMarginfiAccounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false);
         const emptyMarginfiAccounts = (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, existingMarginfiAccounts.map((x) => (0, umi_1.publicKey)(x)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
@@ -102,10 +105,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiAccount: this.marginfiAccountSeedIdx !== undefined
                 ? (0, umi_1.publicKey)(this.marginfiAccount)
                 : this.marginfiAccount,
-            supplyMint: (0, umi_1.publicKey)(this.supplyLiquidityMint),
+            supplyMint: (0, umi_1.publicKey)(this.supplyMint),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyLiquidityTa),
-            debtMint: (0, umi_1.publicKey)(this.debtLiquidityMint),
+            debtMint: (0, umi_1.publicKey)(this.debtMint),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtLiquidityTa),
             signerDebtTa: signerDebtLiquidityTa,
@@ -213,7 +216,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         });
     }
     flashBorrow(flashLoanDetails, destinationTokenAccount) {
-        const bank = flashLoanDetails.mint.equals(this.supplyLiquidityMint)
+        const bank = flashLoanDetails.mint.equals(this.supplyMint)
             ? this.marginfiSupplyBankAccounts
             : this.marginfiDebtBankAccounts;
         return (0, umi_1.transactionBuilder)()
@@ -235,7 +238,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }));
     }
     flashRepay(flashLoanDetails) {
-        const bank = flashLoanDetails.mint.equals(this.supplyLiquidityMint)
+        const bank = flashLoanDetails.mint.equals(this.supplyMint)
             ? this.marginfiSupplyBankAccounts
             : this.marginfiDebtBankAccounts;
         const remainingAccounts = [];
@@ -305,7 +308,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (state) {
             return state;
         }
-        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, this.supplyLiquidityMint, this.debtLiquidityMint, this.livePositionUpdates);
+        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, this.supplyMint, this.debtMint, this.livePositionUpdates);
         this.log(freshState);
         return freshState;
     }

package/dist/constants/tokenConstants.d.ts

@@ -1,3 +1,7 @@
 export declare const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
 export declare const ALL_SUPPORTED_TOKENS: string[];
+export declare const TOKEN_DECIMALS: {
+    [x: string]: number;
+    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: number;
+};
 //# sourceMappingURL=tokenConstants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AAGxE,eAAO,MAAM,oBAAoB,UAGhC,CAAC"}
+{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AAGxE,eAAO,MAAM,oBAAoB,UAGhC,CAAC;AAEF,eAAO,MAAM,cAAc;;;CAG1B,CAAC"}

package/dist/constants/tokenConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_SUPPORTED_TOKENS = exports.USDC_MINT = void 0;
+exports.TOKEN_DECIMALS = exports.ALL_SUPPORTED_TOKENS = exports.USDC_MINT = void 0;
 const spl_token_1 = require("@solana/spl-token");
 exports.USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
 // When adding token ensure a price feed is provided in pythConstants.ts
@@ -8,3 +8,7 @@ exports.ALL_SUPPORTED_TOKENS = [
     spl_token_1.NATIVE_MINT.toString(),
     exports.USDC_MINT,
 ];
+exports.TOKEN_DECIMALS = {
+    [spl_token_1.NATIVE_MINT.toString()]: 9,
+    [exports.USDC_MINT]: 6
+};

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EAQd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiLzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CAsE7B;AA0DD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2GA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EAQd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAgLzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CAsE7B;AA0DD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2GA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}

package/dist/transactions/transactionUtils.js

@@ -14,8 +14,8 @@ const numberUtils_1 = require("../utils/numberUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
 const accountUtils_1 = require("../utils/accountUtils");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
-    const supplyIsWsol = client.supplyLiquidityMint.equals(spl_token_1.NATIVE_MINT);
-    const debtIsWsol = client.debtLiquidityMint.equals(spl_token_1.NATIVE_MINT);
+    const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
+    const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
     if (!supplyIsWsol && !debtIsWsol) {
         return undefined;
     }
@@ -70,7 +70,7 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
             amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
         }
         else if (initiatingDcaIn &&
-            client.debtLiquidityMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
+            client.debtMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
             amountToTransfer += initiatingDcaIn;
         }
         if (amountToTransfer > 0) {
@@ -96,8 +96,8 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
         }
         if (!(0, generalUtils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
             chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
-                ? client.supplyLiquidityMint
-                : client.debtLiquidityMint));
+                ? client.supplyMint
+                : client.debtMint));
             accountsGettingCreated.push(tokenAccount.toString());
         }
     }
@@ -123,12 +123,12 @@ async function rebalanceChoresBefore(client, tx) {
     const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
-        client.log("Creating referred-by TA for ", client.supplyLiquidityMint.toString());
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.supplyLiquidityMint));
+        client.log("Creating referred-by TA for ", client.supplyMint.toString());
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.supplyMint));
     }
     if (checkSolautoFeesTa && !(0, generalUtils_1.rpcAccountCreated)(solautoFeesSupplyTa)) {
-        client.log("Creating Solauto fees TA for ", client.supplyLiquidityMint.toString());
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.solautoFeesWallet, client.supplyLiquidityMint));
+        client.log("Creating Solauto fees TA for ", client.supplyMint.toString());
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.solautoFeesWallet, client.supplyMint));
     }
     if (checkIntermediaryMfiAccount &&
         !(0, generalUtils_1.rpcAccountCreated)(intermediaryMarginfiAccount)) {
@@ -228,7 +228,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         ]);
     }
     if (client.solautoPositionState.liqUtilizationRateBps >
-        (0, generalUtils_2.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps)) {
+        (0, numberUtils_1.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps)) {
         tx = tx.prepend(client.refresh());
     }
     return {

package/dist/utils/generalUtils.js

@@ -45,7 +45,7 @@ function arraysAreEqual(arrayA, arrayB) {
 exports.arraysAreEqual = arraysAreEqual;
 async function getTokenPrices(mints) {
     const currentTime = currentUnixSeconds();
-    if (!mints.some(mint => !(mint.toString() in solautoConstants_1.PRICES) || currentTime - solautoConstants_1.PRICES[mint.toString()].time > 5)) {
+    if (!mints.some(mint => !(mint.toString() in solautoConstants_1.PRICES) || currentTime - solautoConstants_1.PRICES[mint.toString()].time > 3)) {
         console.log("Accessing price cache");
         return mints.map(mint => solautoConstants_1.PRICES[mint.toString()].price);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CA+D7B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAiE7B"}

package/dist/utils/jupiterUtils.js

@@ -31,9 +31,8 @@ async function getJupSwapTransaction(signer, swapDetails) {
                 ? "ExactIn"
                 : undefined,
     });
-    // Up price slippage bps by an extra swapDetails.slippageBpsIncFactor of the estimated price impact (minimum 0.1% price slippage no matter what)
-    const finalPriceSlippageBps = Math.max(quoteResponse.slippageBps ?? 10, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct)) *
-        (1 + (swapDetails.slippageBpsIncFactor ?? 0))));
+    const finalPriceSlippageBps = Math.round(Math.max(quoteResponse.slippageBps ?? 10, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct)))) *
+        (1 + (swapDetails.slippageBpsIncFactor ?? 0)));
     quoteResponse.slippageBps = finalPriceSlippageBps;
     console.log(quoteResponse);
     console.log("Getting jup instructions...");

package/dist/utils/numberUtils.d.ts

@@ -6,4 +6,7 @@ export declare function toBps(value: number): number;
 export declare function bytesToI80F48(bytes: number[]): number;
 export declare function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint;
 export declare function getDebtAdjustmentUsd(liqThresholdBps: number, supplyUsd: number, debtUsd: number, targetLiqUtilizationRateBps: number, adjustmentFeeBps?: number): number;
+export declare function getMaxLiqUtilizationRate(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function maxRepayTo(maxLtvBps: number, liqThresholdBps: number): number;
 //# sourceMappingURL=numberUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKtE;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKpE"}

package/dist/utils/numberUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDebtAdjustmentUsd = exports.uint8ArrayToBigInt = exports.bytesToI80F48 = exports.toBps = exports.fromBps = exports.fromBaseUnit = exports.toBaseUnit = exports.getLiqUtilzationRateBps = void 0;
+exports.maxRepayTo = exports.maxRepayFrom = exports.getMaxLiqUtilizationRate = exports.getDebtAdjustmentUsd = exports.uint8ArrayToBigInt = exports.bytesToI80F48 = exports.toBps = exports.fromBps = exports.fromBaseUnit = exports.toBaseUnit = exports.getLiqUtilzationRateBps = void 0;
+const constants_1 = require("../constants");
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0) {
         return 0;
@@ -60,3 +61,15 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
     return debtAdjustmentUsd;
 }
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
+function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
+    return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+}
+exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
+function maxRepayFrom(maxLtvBps, liqThresholdBps) {
+    return Math.min(9000, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000));
+}
+exports.maxRepayFrom = maxRepayFrom;
+function maxRepayTo(maxLtvBps, liqThresholdBps) {
+    return Math.min(maxRepayFrom(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps));
+}
+exports.maxRepayTo = maxRepayTo;

package/dist/utils/solanaUtils.js

@@ -150,7 +150,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly,
     const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, attemptNum);
     console.log("Compute unit price: ", feeEstimate);
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).buildAndSign(umi))));
-    const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
+    const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
     console.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
         const result = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await assembleFinalTransaction(umi.identity, tx, feeEstimate, computeUnitLimit).sendAndConfirm(umi, {

package/dist/utils/solauto/generalUtils.d.ts

@@ -10,9 +10,6 @@ export declare function getSolautoFeesBps(isReferred: boolean, feeType: FeeType)
     referrer: number;
     total: number;
 };
-export declare function getMaxLiqUtilizationRate(maxLtvBps: number, liqThresholdBps: number): number;
-export declare function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number): number;
-export declare function maxRepayTo(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function eligibileForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings): boolean;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters): boolean;
 export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<{

package/dist/utils/solauto/generalUtils.d.ts.map

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

package/dist/utils/solauto/generalUtils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LivePositionUpdates = exports.getAllPositionsByAuthority = exports.getReferralsByUser = exports.getAllReferralStates = exports.getSolautoManagedPositions = exports.eligibleForRefresh = exports.eligibileForRebalance = exports.maxRepayTo = exports.maxRepayFrom = exports.getMaxLiqUtilizationRate = exports.getSolautoFeesBps = exports.getAdjustedSettingsFromAutomation = exports.getUpdatedValueFromAutomation = exports.eligibleForNextAutomationPeriod = exports.nextAutomationPeriodTimestamp = void 0;
+exports.LivePositionUpdates = exports.getAllPositionsByAuthority = exports.getReferralsByUser = exports.getAllReferralStates = exports.getSolautoManagedPositions = exports.eligibleForRefresh = exports.eligibileForRebalance = exports.getSolautoFeesBps = exports.getAdjustedSettingsFromAutomation = exports.getUpdatedValueFromAutomation = exports.eligibleForNextAutomationPeriod = exports.nextAutomationPeriodTimestamp = void 0;
 const umi_1 = require("@metaplex-foundation/umi");
 const generated_1 = require("../../generated");
 const generalUtils_1 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
-const solautoConstants_1 = require("../../constants/solautoConstants");
 const accountUtils_1 = require("../accountUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
@@ -59,18 +58,6 @@ function getSolautoFeesBps(isReferred, feeType) {
     };
 }
 exports.getSolautoFeesBps = getSolautoFeesBps;
-function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
-    return (0, numberUtils_1.toBps)(((0, numberUtils_1.fromBps)(maxLtvBps) - 0.015) / (0, numberUtils_1.fromBps)(liqThresholdBps)) - 1;
-}
-exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
-function maxRepayFrom(maxLtvBps, liqThresholdBps) {
-    return Math.min(9000, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000));
-}
-exports.maxRepayFrom = maxRepayFrom;
-function maxRepayTo(maxLtvBps, liqThresholdBps) {
-    return Math.min(maxRepayFrom(maxLtvBps, liqThresholdBps) - solautoConstants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps));
-}
-exports.maxRepayTo = maxRepayTo;
 function eligibileForRebalance(positionState, positionSettings, positionDca) {
     if (positionDca.automation.targetPeriods > 0 &&
         eligibleForNextAutomationPeriod(positionDca.automation)) {

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAU5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA4IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA8EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAiE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAmChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAS5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA4IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA+EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAkE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAmChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -93,7 +93,7 @@ function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
         throw new Error("Requires a fresh position state to get rebalance details");
     }
     const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(client, targetLiqUtilizationRateBps);
-    const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), client.solautoPositionState.debt.decimals) * solautoConstants_1.PRICES[client.debtLiquidityMint.toString()].price;
+    const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), client.solautoPositionState.debt.decimals) * solautoConstants_1.PRICES[client.debtMint.toString()].price;
     const increasingLeverage = amountUsdToDcaIn > 0 ||
         client.solautoPositionState.liqUtilizationRateBps < targetRateBps;
     let adjustmentFeeBps = 0;
@@ -103,12 +103,13 @@ function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) + amountUsdToDcaIn;
     const debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     let debtAdjustmentUsd = (0, numberUtils_1.getDebtAdjustmentUsd)(client.solautoPositionState.liqThresholdBps, supplyUsd, debtUsd, targetRateBps, adjustmentFeeBps);
+    debtAdjustmentUsd *= 500;
     const input = increasingLeverage
         ? client.solautoPositionState.debt
         : client.solautoPositionState.supply;
     const inputMarketPrice = increasingLeverage
-        ? solautoConstants_1.PRICES[client.debtLiquidityMint.toString()].price
-        : solautoConstants_1.PRICES[client.supplyLiquidityMint.toString()].price;
+        ? solautoConstants_1.PRICES[client.debtMint.toString()].price
+        : solautoConstants_1.PRICES[client.supplyMint.toString()].price;
     const limitGap = limitGapBps
         ? (0, numberUtils_1.fromBps)(limitGapBps)
         : (0, numberUtils_1.fromBps)(solautoConstants_1.DEFAULT_LIMIT_GAP_BPS);
@@ -141,18 +142,18 @@ function getFlashLoanDetails(client, values, jupQuote) {
             ? debtUsd + debtAdjustmentWithSlippage
             : debtUsd;
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
-    const requiresFlashLoan = supplyUsd === 0 ||
+    const requiresFlashLoan = supplyUsd <= 0 ||
         tempLiqUtilizationRateBps >
-            (0, generalUtils_1.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps);
+            (0, numberUtils_1.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.increasingLeverage) {
         flashLoanToken = client.solautoPositionState.debt;
-        flashLoanTokenPrice = solautoConstants_1.PRICES[client.debtLiquidityMint.toString()].price;
+        flashLoanTokenPrice = solautoConstants_1.PRICES[client.debtMint.toString()].price;
     }
     else {
         flashLoanToken = client.solautoPositionState.supply;
-        flashLoanTokenPrice = solautoConstants_1.PRICES[client.supplyLiquidityMint.toString()].price;
+        flashLoanTokenPrice = solautoConstants_1.PRICES[client.supplyMint.toString()].price;
     }
     const exactAmountBaseUnit = jupQuote && jupQuote.swapMode === "ExactOut"
         ? BigInt(parseInt(jupQuote.inAmount))
@@ -177,15 +178,15 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         : client.solautoPositionState.debt;
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
     const inputPrice = values.increasingLeverage
-        ? solautoConstants_1.PRICES[client.debtLiquidityMint.toString()].price
-        : solautoConstants_1.PRICES[client.supplyLiquidityMint.toString()].price;
+        ? solautoConstants_1.PRICES[client.debtMint.toString()].price
+        : solautoConstants_1.PRICES[client.supplyMint.toString()].price;
     const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / inputPrice, input.decimals);
     const rebalancingToZero = targetLiqUtilizationRateBps === 0;
     return {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
-        // slippageBpsIncFactor: (values.increasingLeverage ? 0.1 : 0.2) + ((attemptNum ?? 0) * 0.1),
+        // slippageBpsIncFactor: (!values.increasingLeverage ? 0.1 : 0) + ((attemptNum ?? 0) * 0.15),
         slippageBpsIncFactor: (attemptNum ?? 0) * 0.15,
         amount: rebalancingToZero
             ? client.solautoPositionState.debt.amountUsed.baseUnit +

package/package.json

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

package/src/clients/solautoClient.ts

@@ -66,8 +66,8 @@ export interface SolautoClientArgs {
   signer?: Signer;
   wallet?: WalletAdapter;
 
-  supplyLiquidityMint?: PublicKey;
-  debtLiquidityMint?: PublicKey;
+  supplyMint?: PublicKey;
+  debtMint?: PublicKey;
 
   referralFeesDestMint?: PublicKey;
   referredByAuthority?: PublicKey;
@@ -87,11 +87,11 @@ export abstract class SolautoClient {
   public solautoPositionData!: SolautoPosition | null;
   public solautoPositionState!: PositionState | undefined;
 
-  public supplyLiquidityMint!: PublicKey;
+  public supplyMint!: PublicKey;
   public positionSupplyLiquidityTa!: PublicKey;
   public signerSupplyLiquidityTa!: PublicKey;
 
-  public debtLiquidityMint!: PublicKey;
+  public debtMint!: PublicKey;
   public positionDebtLiquidityTa!: PublicKey;
   public signerDebtLiquidityTa!: PublicKey;
 
@@ -127,10 +127,7 @@ export abstract class SolautoClient {
     });
   }
 
-  async initialize(
-    args: SolautoClientArgs,
-    lendingPlatform: LendingPlatform,
-  ) {
+  async initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform) {
     if (!args.signer && !args.wallet) {
       throw new Error("Signer or wallet must be provided");
     }
@@ -157,28 +154,28 @@ export abstract class SolautoClient {
     );
     this.solautoPositionState = this.solautoPositionData?.state;
 
-    this.supplyLiquidityMint =
-      args.supplyLiquidityMint ??
+    this.supplyMint =
+      args.supplyMint ??
       toWeb3JsPublicKey(this.solautoPositionData!.position.supplyMint);
     this.positionSupplyLiquidityTa = getTokenAccount(
       this.solautoPosition,
-      this.supplyLiquidityMint
+      this.supplyMint
     );
     this.signerSupplyLiquidityTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.supplyLiquidityMint
+      this.supplyMint
     );
 
-    this.debtLiquidityMint =
-      args.debtLiquidityMint ??
+    this.debtMint =
+      args.debtMint ??
       toWeb3JsPublicKey(this.solautoPositionData!.position.debtMint);
     this.positionDebtLiquidityTa = getTokenAccount(
       this.solautoPosition,
-      this.debtLiquidityMint
+      this.debtMint
     );
     this.signerDebtLiquidityTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
-      this.debtLiquidityMint
+      this.debtMint
     );
 
     this.authorityReferralState = await getReferralState(this.authority);
@@ -196,31 +193,33 @@ export abstract class SolautoClient {
       this.authorityReferralFeesDestMint
     );
 
+    const hasReferredBy =
+      this.authorityReferralStateData &&
+      this.authorityReferralStateData.referredByState !==
+        publicKey(PublicKey.default);
     const referredByAuthority =
+      !hasReferredBy &&
       args.referredByAuthority &&
       !args.referredByAuthority.equals(toWeb3JsPublicKey(this.signer.publicKey))
         ? args.referredByAuthority
         : undefined;
-    this.referredByState =
-      this.authorityReferralStateData &&
-      this.authorityReferralStateData.referredByState !==
-        publicKey(PublicKey.default)
-        ? toWeb3JsPublicKey(this.authorityReferralStateData.referredByState)
-        : referredByAuthority
-          ? await getReferralState(referredByAuthority!)
-          : undefined;
+    this.referredByState = hasReferredBy
+      ? toWeb3JsPublicKey(this.authorityReferralStateData!.referredByState)
+      : referredByAuthority
+        ? await getReferralState(referredByAuthority!)
+        : undefined;
     this.referredByAuthority = referredByAuthority;
     if (this.referredByState !== undefined) {
       this.referredBySupplyTa = getTokenAccount(
         this.referredByState,
-        this.supplyLiquidityMint
+        this.supplyMint
       );
     }
 
     this.solautoFeesWallet = SOLAUTO_FEES_WALLET;
     this.solautoFeesSupplyTa = getTokenAccount(
       this.solautoFeesWallet,
-      this.supplyLiquidityMint
+      this.supplyMint
     );
 
     this.authorityLutAddress = this.authorityReferralStateData?.lookupTable
@@ -443,7 +442,7 @@ export abstract class SolautoClient {
     let positionDebtTa: UmiPublicKey | undefined = undefined;
     let signerDebtTa: UmiPublicKey | undefined = undefined;
     if (isOption(args.dca) && isSome(args.dca)) {
-      debtMint = publicKey(this.debtLiquidityMint);
+      debtMint = publicKey(this.debtMint);
       positionDebtTa = publicKey(this.positionDebtLiquidityTa);
       signerDebtTa = publicKey(this.signerDebtLiquidityTa);
 
@@ -516,7 +515,7 @@ export abstract class SolautoClient {
     if (this.solautoPositionData !== null && !this.selfManaged) {
       const positionData = this.solautoPositionData!.position;
       if (positionData.dca.debtToAddBaseUnit) {
-        debtMint = publicKey(this.debtLiquidityMint);
+        debtMint = publicKey(this.debtMint);
         positionDebtTa = publicKey(this.positionDebtLiquidityTa);
         signerDebtTa = publicKey(this.signerDebtLiquidityTa);
 

package/src/clients/solautoMarginfiClient.ts

@@ -11,6 +11,7 @@ import {
   transactionBuilder,
   createSignerFromKeypair,
   AccountMeta,
+  createUmi,
 } from "@metaplex-foundation/umi";
 import {
   Keypair,
@@ -64,7 +65,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiGroup?: PublicKey;
 }
 
-export function newMarginfiSolautoManagedPositionArgs(
+export function newSolautoMarginfiPositionArgs(
   positionId: number,
   signer: Signer | undefined,
   wallet: WalletAdapter | undefined,
@@ -76,9 +77,16 @@ export function newMarginfiSolautoManagedPositionArgs(
     positionId,
     signer,
     wallet,
+    marginfiAccount:
+      positionId === 0
+        ? createSignerFromKeypair(
+            createUmi(),
+            fromWeb3JsKeypair(Keypair.generate())
+          )
+        : undefined,
     marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
-    supplyLiquidityMint: supplyMint,
-    debtLiquidityMint: debtMint,
+    supplyMint: supplyMint,
+    debtMint: debtMint,
     referredByAuthority,
   };
 }
@@ -129,10 +137,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       : args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP);
 
     this.marginfiSupplyBankAccounts = findMarginfiBankAccounts({
-      mint: this.supplyLiquidityMint.toString(),
+      mint: this.supplyMint.toString(),
     })!;
     this.marginfiDebtBankAccounts = findMarginfiBankAccounts({
-      mint: this.debtLiquidityMint.toString(),
+      mint: this.debtMint.toString(),
     })!;
 
     const existingMarginfiAccounts = await getAllMarginfiAccountsByAuthority(
@@ -218,10 +226,10 @@ export class SolautoMarginfiClient extends SolautoClient {
         this.marginfiAccountSeedIdx !== undefined
           ? publicKey(this.marginfiAccount)
           : (this.marginfiAccount as Signer),
-      supplyMint: publicKey(this.supplyLiquidityMint),
+      supplyMint: publicKey(this.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       positionSupplyTa: publicKey(this.positionSupplyLiquidityTa),
-      debtMint: publicKey(this.debtLiquidityMint),
+      debtMint: publicKey(this.debtMint),
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       positionDebtTa: publicKey(this.positionDebtLiquidityTa),
       signerDebtTa: signerDebtLiquidityTa,
@@ -370,7 +378,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     flashLoanDetails: FlashLoanDetails,
     destinationTokenAccount: PublicKey
   ): TransactionBuilder {
-    const bank = flashLoanDetails.mint.equals(this.supplyLiquidityMint)
+    const bank = flashLoanDetails.mint.equals(this.supplyMint)
       ? this.marginfiSupplyBankAccounts
       : this.marginfiDebtBankAccounts;
     return transactionBuilder()
@@ -397,7 +405,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
-    const bank = flashLoanDetails.mint.equals(this.supplyLiquidityMint)
+    const bank = flashLoanDetails.mint.equals(this.supplyMint)
       ? this.marginfiSupplyBankAccounts
       : this.marginfiDebtBankAccounts;
 
@@ -492,8 +500,8 @@ export class SolautoMarginfiClient extends SolautoClient {
     const freshState = await getMarginfiAccountPositionState(
       this.umi,
       this.marginfiAccountPk,
-      this.supplyLiquidityMint,
-      this.debtLiquidityMint,
+      this.supplyMint,
+      this.debtMint,
       this.livePositionUpdates
     );
     this.log(freshState);

package/src/constants/tokenConstants.ts

@@ -6,4 +6,9 @@ export const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
 export const ALL_SUPPORTED_TOKENS = [
     NATIVE_MINT.toString(),
     USDC_MINT,
-];
+];
+
+export const TOKEN_DECIMALS = {
+    [NATIVE_MINT.toString()]: 9,
+    [USDC_MINT]: 6
+};

package/src/transactions/transactionUtils.ts

@@ -40,10 +40,9 @@ import {
   rpcAccountCreated,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
-import { uint8ArrayToBigInt } from "../utils/numberUtils";
+import { getMaxLiqUtilizationRate, uint8ArrayToBigInt } from "../utils/numberUtils";
 import {
   eligibileForRebalance,
-  getMaxLiqUtilizationRate,
 } from "../utils/solauto/generalUtils";
 import { getTokenAccount } from "../utils/accountUtils";
 
@@ -58,8 +57,8 @@ function getWSolUsage(
   initiatingDcaIn?: bigint,
   cancellingDcaIn?: boolean
 ): wSolTokenUsage | undefined {
-  const supplyIsWsol = client.supplyLiquidityMint.equals(NATIVE_MINT);
-  const debtIsWsol = client.debtLiquidityMint.equals(NATIVE_MINT);
+  const supplyIsWsol = client.supplyMint.equals(NATIVE_MINT);
+  const debtIsWsol = client.debtMint.equals(NATIVE_MINT);
   if (!supplyIsWsol && !debtIsWsol) {
     return undefined;
   }
@@ -142,7 +141,7 @@ async function transactionChoresBefore(
       amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
     } else if (
       initiatingDcaIn &&
-      client.debtLiquidityMint.toString() === NATIVE_MINT.toString()
+      client.debtMint.toString() === NATIVE_MINT.toString()
     ) {
       amountToTransfer += initiatingDcaIn;
     }
@@ -189,8 +188,8 @@ async function transactionChoresBefore(
           client.signer,
           toWeb3JsPublicKey(client.signer.publicKey),
           isSolautoAction("Withdraw", solautoAction)
-            ? client.supplyLiquidityMint
-            : client.debtLiquidityMint
+            ? client.supplyMint
+            : client.debtMint
         )
       );
       accountsGettingCreated.push(tokenAccount.toString());
@@ -238,13 +237,13 @@ export async function rebalanceChoresBefore(
   if (checkReferralSupplyTa && !rpcAccountCreated(referredBySupplyTa)) {
     client.log(
       "Creating referred-by TA for ",
-      client.supplyLiquidityMint.toString()
+      client.supplyMint.toString()
     );
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.referredByState!,
-        client.supplyLiquidityMint
+        client.supplyMint
       )
     );
   }
@@ -252,13 +251,13 @@ export async function rebalanceChoresBefore(
   if (checkSolautoFeesTa && !rpcAccountCreated(solautoFeesSupplyTa)) {
     client.log(
       "Creating Solauto fees TA for ",
-      client.supplyLiquidityMint.toString()
+      client.supplyMint.toString()
     );
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
         client.solautoFeesWallet,
-        client.supplyLiquidityMint
+        client.supplyMint
       )
     );
   }

package/src/utils/generalUtils.ts

@@ -44,7 +44,7 @@ export function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean {
 
 export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
-  if (!mints.some(mint => !(mint.toString() in PRICES) || currentTime - PRICES[mint.toString()].time > 5)) {
+  if (!mints.some(mint => !(mint.toString() in PRICES) || currentTime - PRICES[mint.toString()].time > 3)) {
     console.log("Accessing price cache");
     return mints.map(mint => PRICES[mint.toString()].price);
   }

package/src/utils/jupiterUtils.ts

@@ -64,13 +64,12 @@ export async function getJupSwapTransaction(
         : undefined,
   });
 
-  // Up price slippage bps by an extra swapDetails.slippageBpsIncFactor of the estimated price impact (minimum 0.1% price slippage no matter what)
-  const finalPriceSlippageBps = Math.max(
-    quoteResponse.slippageBps ?? 10,
-    Math.round(
-      toBps(parseFloat(quoteResponse.priceImpactPct)) *
-        (1 + (swapDetails.slippageBpsIncFactor ?? 0))
-    )
+  const finalPriceSlippageBps = Math.round(
+    Math.max(
+      quoteResponse.slippageBps ?? 10,
+      Math.round(toBps(parseFloat(quoteResponse.priceImpactPct)))
+    ) *
+      (1 + (swapDetails.slippageBpsIncFactor ?? 0))
   );
   quoteResponse.slippageBps = finalPriceSlippageBps;
   console.log(quoteResponse);
@@ -82,7 +81,10 @@ export async function getJupSwapTransaction(
       quoteResponse,
       wrapAndUnwrapSol: false,
       useTokenLedger: !swapDetails.exactOut && !swapDetails.exactIn,
-      destinationTokenAccount: getTokenAccount(swapDetails.destinationWallet, swapDetails.outputMint).toString(),
+      destinationTokenAccount: getTokenAccount(
+        swapDetails.destinationWallet,
+        swapDetails.outputMint
+      ).toString(),
     },
   });
 

package/src/utils/numberUtils.ts

@@ -1,3 +1,5 @@
+import { MAX_REPAY_GAP_BPS } from "../constants";
+
 export function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number {
   if (supplyUsd === 0) {
     return 0;
@@ -73,4 +75,25 @@ export function getDebtAdjustmentUsd(
 
   const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) / (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
   return debtAdjustmentUsd;
+}
+
+export function getMaxLiqUtilizationRate(
+  maxLtvBps: number,
+  liqThresholdBps: number
+): number {
+  return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+}
+
+export function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number) {
+  return Math.min(
+    9000,
+    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000)
+  );
+}
+
+export function maxRepayTo(maxLtvBps: number, liqThresholdBps: number) {
+  return Math.min(
+    maxRepayFrom(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
+    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps)
+  );
 }

package/src/utils/solanaUtils.ts

@@ -293,7 +293,7 @@ export async function sendSingleOptimizedTransaction(
   );
 
   const computeUnitLimit = Math.round(
-    simulationResult.value.unitsConsumed! * 1.15
+    simulationResult.value.unitsConsumed! * 1.1
   );
   console.log("Compute unit limit: ", computeUnitLimit);
 

package/src/utils/solauto/generalUtils.ts

@@ -17,12 +17,9 @@ import {
 import { currentUnixSeconds, getTokenPrices } from "../generalUtils";
 import {
   fromBaseUnit,
-  fromBps,
   getLiqUtilzationRateBps,
   toBaseUnit,
-  toBps,
 } from "../numberUtils";
-import { MAX_REPAY_GAP_BPS } from "../../constants/solautoConstants";
 import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { USD_DECIMALS } from "../../constants";
@@ -120,27 +117,6 @@ export function getSolautoFeesBps(
   };
 }
 
-export function getMaxLiqUtilizationRate(
-  maxLtvBps: number,
-  liqThresholdBps: number
-): number {
-  return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1;
-}
-
-export function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number) {
-  return Math.min(
-    9000,
-    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000)
-  );
-}
-
-export function maxRepayTo(maxLtvBps: number, liqThresholdBps: number) {
-  return Math.min(
-    maxRepayFrom(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
-    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps)
-  );
-}
-
 export function eligibileForRebalance(
   positionState: PositionState,
   positionSettings: SolautoSettingsParameters,

package/src/utils/solauto/rebalanceUtils.ts

@@ -4,7 +4,6 @@ import { PositionTokenUsage } from "../../generated";
 import {
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
-  getMaxLiqUtilizationRate,
   getSolautoFeesBps,
   getUpdatedValueFromAutomation,
 } from "./generalUtils";
@@ -17,6 +16,7 @@ import {
   fromBps,
   getDebtAdjustmentUsd,
   getLiqUtilzationRateBps,
+  getMaxLiqUtilizationRate,
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
@@ -144,8 +144,7 @@ function getTargetRateAndDcaAmount(
     };
   } else {
     return {
-      targetRateBps:
-        getStandardTargetLiqUtilizationRateBps(client),
+      targetRateBps: getStandardTargetLiqUtilizationRateBps(client),
     };
   }
 }
@@ -180,7 +179,7 @@ export function getRebalanceValues(
     fromBaseUnit(
       BigInt(Math.round(amountToDcaIn ?? 0)),
       client.solautoPositionState!.debt.decimals
-    ) * PRICES[client.debtLiquidityMint.toString()].price;
+    ) * PRICES[client.debtMint.toString()].price;
 
   const increasingLeverage =
     amountUsdToDcaIn > 0 ||
@@ -209,13 +208,14 @@ export function getRebalanceValues(
     targetRateBps,
     adjustmentFeeBps
   );
+  debtAdjustmentUsd *= 500;
 
   const input = increasingLeverage
     ? client.solautoPositionState!.debt
     : client.solautoPositionState!.supply;
   const inputMarketPrice = increasingLeverage
-    ? PRICES[client.debtLiquidityMint.toString()].price
-    : PRICES[client.supplyLiquidityMint.toString()].price;
+    ? PRICES[client.debtMint.toString()].price
+    : PRICES[client.supplyMint.toString()].price;
 
   const limitGap = limitGapBps
     ? fromBps(limitGapBps)
@@ -270,13 +270,14 @@ export function getFlashLoanDetails(
     values.debtAdjustmentUsd > 0
       ? debtUsd + debtAdjustmentWithSlippage
       : debtUsd;
+  
   const tempLiqUtilizationRateBps = getLiqUtilzationRateBps(
     supplyUsd,
     debtUsd,
     client.solautoPositionState!.liqThresholdBps
   );
   const requiresFlashLoan =
-    supplyUsd === 0 ||
+    supplyUsd <= 0 ||
     tempLiqUtilizationRateBps >
       getMaxLiqUtilizationRate(
         client.solautoPositionState!.maxLtvBps,
@@ -287,10 +288,10 @@ export function getFlashLoanDetails(
   let flashLoanTokenPrice = 0;
   if (values.increasingLeverage) {
     flashLoanToken = client.solautoPositionState!.debt;
-    flashLoanTokenPrice = PRICES[client.debtLiquidityMint.toString()].price;
+    flashLoanTokenPrice = PRICES[client.debtMint.toString()].price;
   } else {
     flashLoanToken = client.solautoPositionState!.supply;
-    flashLoanTokenPrice = PRICES[client.supplyLiquidityMint.toString()].price;
+    flashLoanTokenPrice = PRICES[client.supplyMint.toString()].price;
   }
 
   const exactAmountBaseUnit =
@@ -333,8 +334,8 @@ export function getJupSwapRebalanceDetails(
     Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
 
   const inputPrice = values.increasingLeverage
-    ? PRICES[client.debtLiquidityMint.toString()].price
-    : PRICES[client.supplyLiquidityMint.toString()].price;
+    ? PRICES[client.debtMint.toString()].price
+    : PRICES[client.supplyMint.toString()].price;
   const inputAmount = toBaseUnit(usdToSwap / inputPrice!, input.decimals);
 
   const rebalancingToZero = targetLiqUtilizationRateBps === 0;
@@ -342,7 +343,7 @@ export function getJupSwapRebalanceDetails(
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
-    // slippageBpsIncFactor: (values.increasingLeverage ? 0.1 : 0.2) + ((attemptNum ?? 0) * 0.1),
+    // slippageBpsIncFactor: (!values.increasingLeverage ? 0.1 : 0) + ((attemptNum ?? 0) * 0.15),
     slippageBpsIncFactor: (attemptNum ?? 0) * 0.15,
     amount: rebalancingToZero
       ? client.solautoPositionState!.debt.amountUsed.baseUnit +

package/tests/transactions/solautoMarginfi.ts

@@ -1,9 +1,9 @@
-import { describe, it } from 'mocha';
+import { describe, it } from "mocha";
 import { none, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import {
   SolautoMarginfiClient,
-  newMarginfiSolautoManagedPositionArgs,
+  newSolautoMarginfiPositionArgs,
 } from "../../src/clients/solautoMarginfiClient";
 import {
   solautoAction,
@@ -17,6 +17,8 @@ import {
   TransactionItem,
   TransactionsManager,
 } from "../../src/transactions/transactionsManager";
+import { PublicKey } from "@solana/web3.js";
+import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
@@ -33,12 +35,12 @@ describe("Solauto Marginfi tests", async () => {
     const debtDecimals = 6;
 
     await client.initialize(
-      // newMarginfiSolautoManagedPositionArgs(
+      // newSolautoMarginfiPositionArgs(
       //   positionId,
       //   signer,
       //   undefined,
       //   supply,
-      //   debt
+      //   new PublicKey(USDC_MINT)
       // )
       {
         signer,

package/tests/unit/rebalanceCalculations.ts

@@ -92,11 +92,12 @@ async function getFakePosition(
   settings: SolautoSettingsParameters,
   dca?: DCASettings
 ): Promise<SolautoClient> {
-  const client = new SolautoMarginfiClient(true);
+  const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY ?? "", true);
   await client.initialize(
     newMarginfiSolautoManagedPositionArgs(
       1,
       signer,
+      undefined,
       new PublicKey(NATIVE_MINT),
       new PublicKey(MARGINFI_ACCOUNTS.USDC.mint)
     )
@@ -124,8 +125,8 @@ async function getFakePosition(
         padding: new Uint8Array([]),
       },
       lendingPlatform: LendingPlatform.Marginfi,
-      supplyMint: publicKey(client.supplyLiquidityMint),
-      debtMint: publicKey(client.debtLiquidityMint),
+      supplyMint: publicKey(client.supplyMint),
+      debtMint: publicKey(client.debtMint),
       protocolAccount: publicKey(PublicKey.default),
       settingParams: settings,
       padding1: [],
@@ -267,11 +268,12 @@ describe("Rebalance tests", async () => {
   });
 
   it("Standard rebalance with target rate", async () => {
-    const client = new SolautoMarginfiClient(true);
+    const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY ?? "", true);
     await client.initialize(
       newMarginfiSolautoManagedPositionArgs(
         1,
         signer,
+        undefined,
         new PublicKey(NATIVE_MINT),
         new PublicKey(MARGINFI_ACCOUNTS.USDC.mint)
       )