@haven-fi/solauto-sdk 1.0.69 → 1.0.71

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;AASnE,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;IA8C9B,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"}
+{"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;AAM1D,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;AASnE,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;IAuC1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,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;IA6ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -40,12 +40,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiGroup = marginfiAccountData
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccountData.group)
             : args.marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
-        this.marginfiSupplyAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
-            mint: this.supplyMint.toString(),
-        });
-        this.marginfiDebtAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
-            mint: this.debtMint.toString(),
-        });
+        this.marginfiSupplyAccounts =
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()];
+        this.marginfiDebtAccounts = marginfiAccounts_1.MARGINFI_ACCOUNTS[this.debtMint.toString()];
         if (!this.initialized) {
             await this.setIntermediaryMarginfiDetails();
         }
@@ -78,7 +75,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         return [
             ...super.lutAccountsToAdd(),
             this.marginfiAccountPk,
-            ...(this.signer.publicKey.toString() === this.authority.toString() ? [this.intermediaryMarginfiAccountPk] : []),
+            ...(this.signer.publicKey.toString() === this.authority.toString()
+                ? [this.intermediaryMarginfiAccountPk]
+                : []),
         ];
     }
     marginfiAccountInitialize() {
@@ -344,8 +343,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                             isWritable: false,
                         },
                         {
-                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)({ bank: x.bankPk.toString() })
-                                .priceOracle),
+                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.bankPk)).priceOracle),
                             isSigner: false,
                             isWritable: false,
                         },

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAErF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CAerE,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAErF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CAyBrE,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}

package/dist/constants/marginfiAccounts.js

@@ -5,19 +5,29 @@ const spl_token_1 = require("@solana/spl-token");
 const tokenConstants_1 = require("./tokenConstants");
 exports.DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 exports.MARGINFI_ACCOUNTS = {
-    SOL: {
-        mint: spl_token_1.NATIVE_MINT.toString(),
+    [spl_token_1.NATIVE_MINT.toString()]: {
         bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
         liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
         vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
         priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
     },
-    USDC: {
-        mint: tokenConstants_1.USDC_MINT,
+    [tokenConstants_1.USDC_MINT]: {
         bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
         liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
         vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
         priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+    },
+    [tokenConstants_1.B_SOL]: {
+        bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+        liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+        vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+        priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+    },
+    [tokenConstants_1.JUP]: {
+        bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+        liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+        vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+        priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
     }
 };
 exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/dist/constants/pythConstants.d.ts

@@ -1,5 +1,7 @@
 export declare const PYTH_PRICE_FEED_IDS: {
     [x: string]: string;
     EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: string;
+    bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1: string;
+    JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN: string;
 };
 //# sourceMappingURL=pythConstants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;CAK/B,CAAC"}
+{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;;;CAO/B,CAAC"}

package/dist/constants/pythConstants.js

@@ -7,4 +7,6 @@ const tokenConstants_1 = require("./tokenConstants");
 exports.PYTH_PRICE_FEED_IDS = {
     [spl_token_1.NATIVE_MINT.toString()]: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
     [tokenConstants_1.USDC_MINT]: "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+    [tokenConstants_1.B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+    [tokenConstants_1.JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
 };

package/dist/constants/tokenConstants.d.ts

@@ -1,8 +1,14 @@
 export declare const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+export declare const B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+export declare const JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 export declare const ALL_SUPPORTED_TOKENS: string[];
-export declare const TOKEN_DECIMALS: {
-    [x: string]: number;
-    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: number;
+interface TokenInfo {
+    decimals: number;
+    isStableCoin?: boolean;
+    isLST?: boolean;
+}
+export declare const TOKEN_INFO: {
+    [key: string]: TokenInfo;
 };
-export declare const STABLECOINS: string[];
+export {};
 //# 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":"AAGA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AAGxE,eAAO,MAAM,oBAAoB,UAGhC,CAAC;AAEF,eAAO,MAAM,cAAc;;;CAG1B,CAAC;AAEF,eAAO,MAAM,WAAW,UAEvB,CAAC"}
+{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,iDAAiD,CAAC;AACxE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AAGjE,eAAO,MAAM,oBAAoB,UAKhC,CAAC;AAEF,UAAU,SAAS;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,UAAU,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAelD,CAAC"}

package/dist/constants/tokenConstants.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STABLECOINS = exports.TOKEN_DECIMALS = exports.ALL_SUPPORTED_TOKENS = exports.USDC_MINT = void 0;
+exports.TOKEN_INFO = exports.ALL_SUPPORTED_TOKENS = exports.JUP = exports.B_SOL = exports.USDC_MINT = void 0;
 const spl_token_1 = require("@solana/spl-token");
-// When adding token ensure a price feed is provided in pythConstants.ts & the token is added to the necessary lists below
+// When adding token ensure a price feed is provided in pythConstants.ts & the token is in TOKEN_INFO
 exports.USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+exports.B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+exports.JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 exports.ALL_SUPPORTED_TOKENS = [
     spl_token_1.NATIVE_MINT.toString(),
     exports.USDC_MINT,
+    exports.B_SOL,
+    exports.JUP,
 ];
-exports.TOKEN_DECIMALS = {
-    [spl_token_1.NATIVE_MINT.toString()]: 9,
-    [exports.USDC_MINT]: 6
+exports.TOKEN_INFO = {
+    [spl_token_1.NATIVE_MINT.toString()]: {
+        decimals: 9,
+    },
+    [exports.USDC_MINT]: {
+        decimals: 6,
+        isStableCoin: true
+    },
+    [exports.B_SOL]: {
+        decimals: 9,
+        isLST: true
+    },
+    [exports.JUP]: {
+        decimals: 6
+    }
 };
-exports.STABLECOINS = [
-    exports.USDC_MINT
-];

package/dist/generated/accounts/solautoPosition.d.ts

@@ -7,7 +7,7 @@
  */
 import { Account, Context, Pda, PublicKey, RpcAccount, RpcGetAccountOptions, RpcGetAccountsOptions } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { PodBool, PodBoolArgs, PositionData, PositionDataArgs, PositionState, PositionStateArgs, RebalanceData, RebalanceDataArgs } from '../types';
+import { FeeType, FeeTypeArgs, PodBool, PodBoolArgs, PositionData, PositionDataArgs, PositionState, PositionStateArgs, RebalanceData, RebalanceDataArgs } from '../types';
 export type SolautoPosition = Account<SolautoPositionAccountData>;
 export type SolautoPositionAccountData = {
     bump: Array<number>;
@@ -18,6 +18,8 @@ export type SolautoPositionAccountData = {
     position: PositionData;
     state: PositionState;
     rebalance: RebalanceData;
+    feeType: FeeType;
+    padding2: Array<number>;
     padding: Array<number>;
 };
 export type SolautoPositionAccountDataArgs = {
@@ -29,6 +31,8 @@ export type SolautoPositionAccountDataArgs = {
     position: PositionDataArgs;
     state: PositionStateArgs;
     rebalance: RebalanceDataArgs;
+    feeType: FeeTypeArgs;
+    padding2: Array<number>;
     padding: Array<number>;
 };
 export declare function getSolautoPositionAccountDataSerializer(): Serializer<SolautoPositionAccountDataArgs, SolautoPositionAccountData>;
@@ -46,6 +50,8 @@ export declare function getSolautoPositionGpaBuilder(context: Pick<Context, 'rpc
     position: PositionDataArgs;
     state: PositionStateArgs;
     rebalance: RebalanceDataArgs;
+    feeType: FeeTypeArgs;
+    padding2: Array<number>;
     padding: Array<number>;
 }>;
 export declare function getSolautoPositionSize(): number;

package/dist/generated/accounts/solautoPosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/accounts/solautoPosition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/accounts/solautoPosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EACP,GAAG,EACH,SAAS,EACT,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EAKtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,OAAO,EACP,WAAW,EACX,OAAO,EACP,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EAMlB,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAElE,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,uCAAuC,IAAI,UAAU,CACnE,8BAA8B,EAC9B,0BAA0B,CAC3B,CAiBA;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,GACrB,eAAe,CAKjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,GAAG,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAO1B;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,GAAG,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAMjC;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,eAAe,EAAE,CAAC,CAS5B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,eAAe,EAAE,CAAC,CAU5B;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,UAAU,CAAC;UAQhC,KAAK,CAAC,MAAM,CAAC;gBACP,KAAK,CAAC,MAAM,CAAC;iBACZ,WAAW;cACd,KAAK,CAAC,MAAM,CAAC;eACZ,SAAS;cACV,gBAAgB;WACnB,iBAAiB;eACb,iBAAiB;aACnB,WAAW;cACV,KAAK,CAAC,MAAM,CAAC;aACd,KAAK,CAAC,MAAM,CAAC;GAiB3B;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C"}

package/dist/generated/accounts/solautoPosition.js

@@ -28,7 +28,9 @@ function getSolautoPositionAccountDataSerializer() {
         ['position', (0, types_1.getPositionDataSerializer)()],
         ['state', (0, types_1.getPositionStateSerializer)()],
         ['rebalance', (0, types_1.getRebalanceDataSerializer)()],
-        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 32 })],
+        ['feeType', (0, types_1.getFeeTypeSerializer)()],
+        ['padding2', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 7 })],
+        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 30 })],
     ], { description: 'SolautoPositionAccountData' });
 }
 function deserializeSolautoPosition(rawAccount) {
@@ -68,7 +70,9 @@ function getSolautoPositionGpaBuilder(context) {
         position: [40, (0, types_1.getPositionDataSerializer)()],
         state: [360, (0, types_1.getPositionStateSerializer)()],
         rebalance: [648, (0, types_1.getRebalanceDataSerializer)()],
-        padding: [704, (0, serializers_1.array)((0, serializers_1.u32)(), { size: 32 })],
+        feeType: [704, (0, types_1.getFeeTypeSerializer)()],
+        padding2: [705, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 7 })],
+        padding: [712, (0, serializers_1.array)((0, serializers_1.u32)(), { size: 30 })],
     })
         .deserializeUsing((account) => deserializeSolautoPosition(account));
 }

package/dist/generated/types/feeType.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+import { Serializer } from '@metaplex-foundation/umi/serializers';
+export declare enum FeeType {
+    Small = 0,
+    Default = 1
+}
+export type FeeTypeArgs = FeeType;
+export declare function getFeeTypeSerializer(): Serializer<FeeTypeArgs, FeeType>;
+//# sourceMappingURL=feeType.d.ts.map

package/dist/generated/types/feeType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"feeType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/feeType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,OAAO;IACjB,KAAK,IAAA;IACL,OAAO,IAAA;CACR;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;AAElC,wBAAgB,oBAAoB,IAAI,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAKvE"}

package/dist/generated/types/feeType.js

@@ -0,0 +1,20 @@
+"use strict";
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeeType = void 0;
+exports.getFeeTypeSerializer = getFeeTypeSerializer;
+const serializers_1 = require("@metaplex-foundation/umi/serializers");
+var FeeType;
+(function (FeeType) {
+    FeeType[FeeType["Small"] = 0] = "Small";
+    FeeType[FeeType["Default"] = 1] = "Default";
+})(FeeType || (exports.FeeType = FeeType = {}));
+function getFeeTypeSerializer() {
+    return (0, serializers_1.scalarEnum)(FeeType, { description: 'FeeType' });
+}

package/dist/generated/types/index.d.ts

@@ -9,6 +9,7 @@ export * from './automationSettings';
 export * from './automationSettingsInp';
 export * from './dCASettings';
 export * from './dCASettingsInp';
+export * from './feeType';
 export * from './lendingPlatform';
 export * from './podBool';
 export * from './positionData';

package/dist/generated/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}

package/dist/generated/types/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./automationSettings"), exports);
 __exportStar(require("./automationSettingsInp"), exports);
 __exportStar(require("./dCASettings"), exports);
 __exportStar(require("./dCASettingsInp"), exports);
+__exportStar(require("./feeType"), exports);
 __exportStar(require("./lendingPlatform"), exports);
 __exportStar(require("./podBool"), exports);
 __exportStar(require("./positionData"), exports);

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,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA0HA;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,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2HA;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

@@ -329,7 +329,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         client.log("Not eligible for a rebalance");
         return undefined;
     }
-    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price, targetLiqUtilizationRateBps);
+    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), client.solautoPositionData.feeType, (0, generalUtils_1.currentUnixSeconds)(), constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price, targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);

package/dist/types/accounts.d.ts

@@ -1,5 +1,4 @@
 export interface MarginfiAssetAccounts {
-    mint: string;
     bank: string;
     liquidityVault: string;
     vaultAuthority: string;

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

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/dist/utils/marginfiUtils.d.ts

@@ -4,10 +4,7 @@ import { Bank } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
-export declare function findMarginfiAccounts({ mint, bank, }: {
-    mint?: string;
-    bank?: string;
-}): MarginfiAssetAccounts;
+export declare function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts;
 export declare function getMaxLtvAndLiqThreshold(umi: Umi, supply: {
     mint: PublicKey;
     bank?: Bank | null;

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,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,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"}
+{"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,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA2D3B;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

@@ -15,28 +15,22 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("./solanaUtils");
-function findMarginfiAccounts({ mint, bank, }) {
+function findMarginfiAccounts(bank) {
     for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
         const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[key];
-        if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
-            return account;
-        }
-        if (bank && account.bank.toString().toLowerCase() === bank.toLowerCase()) {
+        if (account.bank.toString().toLowerCase() === bank.toString().toLowerCase()) {
             return account;
         }
     }
-    throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
+    throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
     if (!supply.bank || supply.bank === null) {
-        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
-            mint: supply.mint.toString(),
-        }).bank));
+        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supply.mint.toString()].bank));
     }
-    if ((!debt.bank || debt.bank === null) && !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 ((!debt.bank || debt.bank === null) &&
+        !debt.mint.equals(web3_js_1.PublicKey.default)) {
+        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debt.mint.toString()].bank));
     }
     if (!supplyPrice) {
         const [price] = await (0, generalUtils_1.getTokenPrices)([
@@ -141,10 +135,10 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
 async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMint, debtMint, livePositionUpdates) {
     let marginfiAccount = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(marginfiAccountPk));
     let supplyBank = supplyMint && supplyMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: supplyMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supplyMint.toString()].bank))
         : null;
     let debtBank = debtMint && debtMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: debtMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debtMint.toString()].bank))
         : null;
     let supplyUsage = undefined;
     let debtUsage = undefined;

package/dist/utils/numberUtils.d.ts

@@ -1,3 +1,4 @@
+import { FeeType } from "../generated";
 export declare function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number;
 export declare function toBaseUnit(value: number, decimals: number): bigint;
 export declare function fromBaseUnit(value: bigint, decimals: number): number;
@@ -6,7 +7,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 getSolautoFeesBps(isReferred: boolean, selfManaged: boolean, positionNetWorthUsd: number): {
+export declare function getSolautoFeesBps(isReferred: boolean, feeType: FeeType, positionNetWorthUsd: number): {
     solauto: number;
     referrer: number;
     total: number;

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,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,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,EACpB,mBAAmB,EAAE,MAAM,GAC1B;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CA8BA;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAER;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAEvE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,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,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,EAChB,mBAAmB,EAAE,MAAM,GAC1B;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CA8BA;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAER;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAEvE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}

package/dist/utils/numberUtils.js

@@ -14,6 +14,7 @@ exports.maxBoostToBps = maxBoostToBps;
 exports.maxRepayFromBps = maxRepayFromBps;
 exports.maxRepayToBps = maxRepayToBps;
 const constants_1 = require("../constants");
+const generated_1 = require("../generated");
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0) {
         return 0;
@@ -66,13 +67,13 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
         (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
     return debtAdjustmentUsd;
 }
-function getSolautoFeesBps(isReferred, selfManaged, positionNetWorthUsd) {
+function getSolautoFeesBps(isReferred, feeType, positionNetWorthUsd) {
     const minSize = 10000; // Minimum position size
     const maxSize = 1000000; // Maximum position size
     const maxFeeBps = 500; // Fee in basis points for minSize (5%)
     const minFeeBps = 100; // Fee in basis points for maxSize (1%)
     let feeBps = 0;
-    if (selfManaged) {
+    if (feeType === generated_1.FeeType.Small) {
         feeBps = 100;
     }
     else if (positionNetWorthUsd <= minSize) {

package/dist/utils/solauto/generalUtils.js

@@ -235,8 +235,8 @@ async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     };
 }
 function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
-    const supplyDecimals = constants_1.TOKEN_DECIMALS[supply.mint.toString()];
-    const debtDecimals = constants_1.TOKEN_DECIMALS[debt.mint.toString()];
+    const supplyDecimals = constants_1.TOKEN_INFO[supply.mint.toString()].decimals;
+    const debtDecimals = constants_1.TOKEN_INFO[debt.mint.toString()].decimals;
     const supplyUsd = supply.amountUsed * supply.price;
     const debtUsd = debt.amountUsed * debt.price;
     return {

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

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
-import { DCASettings, PositionState, SolautoSettingsParameters } from "../../generated";
+import { DCASettings, FeeType, PositionState, SolautoSettingsParameters } from "../../generated";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
 export interface RebalanceValues {
@@ -9,7 +9,7 @@ export interface RebalanceValues {
     amountToDcaIn: number;
     amountUsdToDcaIn: number;
 }
-export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number, limitGapBps?: number): RebalanceValues;
+export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, feeType: FeeType, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number, limitGapBps?: number): RebalanceValues;
 export interface FlashLoanDetails {
     baseUnitAmount: bigint;
     mint: PublicKey;

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;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;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,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"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;AAC5D,OAAO,EACL,WAAW,EACX,OAAO,EACP,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;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,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -79,7 +79,7 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
         };
     }
 }
-function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps, limitGapBps) {
+function getRebalanceValues(state, settings, dca, feeType, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps, limitGapBps) {
     if (state === undefined ||
         state.lastUpdated <
             BigInt(Math.round((0, generalUtils_2.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS))) {
@@ -91,7 +91,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
     const increasingLeverage = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps < targetRateBps;
     let adjustmentFeeBps = 0;
     if (increasingLeverage) {
-        adjustmentFeeBps = (0, numberUtils_1.getSolautoFeesBps)(false, settings === undefined, (0, numberUtils_1.fromBaseUnit)(state.netWorth.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS)).total;
+        adjustmentFeeBps = (0, numberUtils_1.getSolautoFeesBps)(false, feeType, (0, numberUtils_1.fromBaseUnit)(state.netWorth.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS)).total;
     }
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
         amountUsdToDcaIn;

package/local/updateMarginfiLUT.ts

@@ -14,7 +14,7 @@ async function addBanks() {
     const accounts = MARGINFI_ACCOUNTS[key];
     await updateLookupTable(
       [
-        accounts.mint,
+        key,
         accounts.bank,
         accounts.liquidityVault,
         accounts.vaultAuthority,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "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

@@ -16,6 +16,7 @@ import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import {
   DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
 } from "../constants/marginfiAccounts";
 import {
@@ -108,12 +109,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       ? toWeb3JsPublicKey(marginfiAccountData.group)
       : args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP);
 
-    this.marginfiSupplyAccounts = findMarginfiAccounts({
-      mint: this.supplyMint.toString(),
-    })!;
-    this.marginfiDebtAccounts = findMarginfiAccounts({
-      mint: this.debtMint.toString(),
-    })!;
+    this.marginfiSupplyAccounts =
+      MARGINFI_ACCOUNTS[this.supplyMint.toString()]!;
+    this.marginfiDebtAccounts = MARGINFI_ACCOUNTS[this.debtMint.toString()]!;
 
     if (!this.initialized) {
       await this.setIntermediaryMarginfiDetails();
@@ -171,7 +169,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     return [
       ...super.lutAccountsToAdd(),
       this.marginfiAccountPk,
-      ...(this.signer.publicKey.toString() === this.authority.toString() ? [this.intermediaryMarginfiAccountPk] : []),
+      ...(this.signer.publicKey.toString() === this.authority.toString()
+        ? [this.intermediaryMarginfiAccountPk]
+        : []),
     ];
   }
 
@@ -358,17 +358,13 @@ export class SolautoMarginfiClient extends SolautoClient {
           : this.positionDebtTa
       );
       vaultDebtTa = publicKey(this.marginfiDebtAccounts.liquidityVault);
-      debtVaultAuthority = publicKey(
-        this.marginfiDebtAccounts.vaultAuthority
-      );
+      debtVaultAuthority = publicKey(this.marginfiDebtAccounts.vaultAuthority);
     }
 
     let supplyPriceOracle: UmiPublicKey | undefined = undefined;
     let debtPriceOracle: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-      supplyPriceOracle = publicKey(
-        this.marginfiSupplyAccounts.priceOracle
-      );
+      supplyPriceOracle = publicKey(this.marginfiSupplyAccounts.priceOracle);
       debtPriceOracle = publicKey(this.marginfiDebtAccounts.priceOracle);
     }
 
@@ -512,8 +508,7 @@ export class SolautoMarginfiClient extends SolautoClient {
               },
               {
                 pubkey: publicKey(
-                  findMarginfiAccounts({ bank: x.bankPk.toString() })
-                    .priceOracle
+                  findMarginfiAccounts(toWeb3JsPublicKey(x.bankPk)).priceOracle
                 ),
                 isSigner: false,
                 isWritable: false,

package/src/constants/marginfiAccounts.ts

@@ -1,23 +1,33 @@
 import { NATIVE_MINT } from "@solana/spl-token";
-import { USDC_MINT } from "./tokenConstants";
+import { B_SOL, JUP, USDC_MINT } from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
 
 export const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
 export const MARGINFI_ACCOUNTS: { [key: string]: MarginfiAssetAccounts } = {
-  SOL: {
-    mint: NATIVE_MINT.toString(),
+  [NATIVE_MINT.toString()]: {
     bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
     liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
     vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
     priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
   },
-  USDC: {
-    mint: USDC_MINT,
+  [USDC_MINT]: {
     bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
     liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
     vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
     priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+  },
+  [B_SOL]: {
+    bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+    liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+    vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+    priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+  },
+  [JUP]: {
+    bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+    liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+    vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+    priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
   }
 };
 

package/src/constants/pythConstants.ts

@@ -1,5 +1,5 @@
 import { NATIVE_MINT } from "@solana/spl-token";
-import { USDC_MINT } from "./tokenConstants";
+import { B_SOL, JUP, USDC_MINT } from "./tokenConstants";
 
 // https://pyth.network/developers/price-feed-ids#solana-stable
 export const PYTH_PRICE_FEED_IDS = {
@@ -7,4 +7,6 @@ export const PYTH_PRICE_FEED_IDS = {
     "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
   [USDC_MINT]:
     "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-};
+  [B_SOL]: "0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c",
+  [JUP]: "0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996",
+};

package/src/constants/tokenConstants.ts

@@ -1,19 +1,37 @@
 import { NATIVE_MINT } from "@solana/spl-token";
 
-// When adding token ensure a price feed is provided in pythConstants.ts & the token is added to the necessary lists below
+// When adding token ensure a price feed is provided in pythConstants.ts & the token is in TOKEN_INFO
 export const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+export const B_SOL = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1";
+export const JUP = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 
 
 export const ALL_SUPPORTED_TOKENS = [
     NATIVE_MINT.toString(),
     USDC_MINT,
+    B_SOL,
+    JUP,
 ];
 
-export const TOKEN_DECIMALS = {
-    [NATIVE_MINT.toString()]: 9,
-    [USDC_MINT]: 6
-};
+interface TokenInfo {
+    decimals: number;
+    isStableCoin?: boolean;
+    isLST?: boolean;
+}
 
-export const STABLECOINS = [
-    USDC_MINT
-];
+export const TOKEN_INFO: { [key: string]: TokenInfo } = {
+    [NATIVE_MINT.toString()]: {
+        decimals: 9,
+    },
+    [USDC_MINT]: {
+        decimals: 6,
+        isStableCoin: true
+    },
+    [B_SOL]: {
+        decimals: 9,
+        isLST: true
+    },
+    [JUP]: {
+        decimals: 6
+    }
+};

package/src/generated/accounts/solautoPosition.ts

@@ -28,6 +28,8 @@ import {
   u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
+  FeeType,
+  FeeTypeArgs,
   PodBool,
   PodBoolArgs,
   PositionData,
@@ -36,6 +38,7 @@ import {
   PositionStateArgs,
   RebalanceData,
   RebalanceDataArgs,
+  getFeeTypeSerializer,
   getPodBoolSerializer,
   getPositionDataSerializer,
   getPositionStateSerializer,
@@ -53,6 +56,8 @@ export type SolautoPositionAccountData = {
   position: PositionData;
   state: PositionState;
   rebalance: RebalanceData;
+  feeType: FeeType;
+  padding2: Array<number>;
   padding: Array<number>;
 };
 
@@ -65,6 +70,8 @@ export type SolautoPositionAccountDataArgs = {
   position: PositionDataArgs;
   state: PositionStateArgs;
   rebalance: RebalanceDataArgs;
+  feeType: FeeTypeArgs;
+  padding2: Array<number>;
   padding: Array<number>;
 };
 
@@ -82,7 +89,9 @@ export function getSolautoPositionAccountDataSerializer(): Serializer<
       ['position', getPositionDataSerializer()],
       ['state', getPositionStateSerializer()],
       ['rebalance', getRebalanceDataSerializer()],
-      ['padding', array(u32(), { size: 32 })],
+      ['feeType', getFeeTypeSerializer()],
+      ['padding2', array(u8(), { size: 7 })],
+      ['padding', array(u32(), { size: 30 })],
     ],
     { description: 'SolautoPositionAccountData' }
   ) as Serializer<SolautoPositionAccountDataArgs, SolautoPositionAccountData>;
@@ -170,6 +179,8 @@ export function getSolautoPositionGpaBuilder(
       position: PositionDataArgs;
       state: PositionStateArgs;
       rebalance: RebalanceDataArgs;
+      feeType: FeeTypeArgs;
+      padding2: Array<number>;
       padding: Array<number>;
     }>({
       bump: [0, array(u8(), { size: 1 })],
@@ -180,7 +191,9 @@ export function getSolautoPositionGpaBuilder(
       position: [40, getPositionDataSerializer()],
       state: [360, getPositionStateSerializer()],
       rebalance: [648, getRebalanceDataSerializer()],
-      padding: [704, array(u32(), { size: 32 })],
+      feeType: [704, getFeeTypeSerializer()],
+      padding2: [705, array(u8(), { size: 7 })],
+      padding: [712, array(u32(), { size: 30 })],
     })
     .deserializeUsing<SolautoPosition>((account) =>
       deserializeSolautoPosition(account)

package/src/generated/types/feeType.ts

@@ -0,0 +1,23 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+
+import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
+
+export enum FeeType {
+  Small,
+  Default,
+}
+
+export type FeeTypeArgs = FeeType;
+
+export function getFeeTypeSerializer(): Serializer<FeeTypeArgs, FeeType> {
+  return scalarEnum<FeeType>(FeeType, { description: 'FeeType' }) as Serializer<
+    FeeTypeArgs,
+    FeeType
+  >;
+}

package/src/generated/types/index.ts

@@ -10,6 +10,7 @@ export * from './automationSettings';
 export * from './automationSettingsInp';
 export * from './dCASettings';
 export * from './dCASettingsInp';
+export * from './feeType';
 export * from './lendingPlatform';
 export * from './podBool';
 export * from './positionData';

package/src/transactions/transactionUtils.ts

@@ -580,6 +580,7 @@ export async function buildSolautoRebalanceTransaction(
     client.solautoPositionState!,
     client.solautoPositionSettings(),
     client.solautoPositionActiveDca(),
+    client.solautoPositionData!.feeType,
     currentUnixSeconds(),
     PRICES[client.supplyMint.toString()].price,
     PRICES[client.debtMint.toString()].price,

package/src/types/accounts.ts

@@ -1,5 +1,4 @@
 export interface MarginfiAssetAccounts {
-  mint: string;
   bank: string;
   liquidityVault: string;
   vaultAuthority: string;

package/src/utils/marginfiUtils.ts

@@ -23,23 +23,16 @@ import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { currentUnixSecondsSolana } from "./solanaUtils";
 
-export function findMarginfiAccounts({
-  mint,
-  bank,
-}: {
-  mint?: string;
-  bank?: string;
-}): MarginfiAssetAccounts {
+export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
   for (const key in MARGINFI_ACCOUNTS) {
     const account = MARGINFI_ACCOUNTS[key];
-    if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
-      return account;
-    }
-    if (bank && account.bank.toString().toLowerCase() === bank.toLowerCase()) {
+    if (
+      account.bank.toString().toLowerCase() === bank.toString().toLowerCase()
+    ) {
       return account;
     }
   }
-  throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
+  throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
 export async function getMaxLtvAndLiqThreshold(
@@ -57,21 +50,18 @@ export async function getMaxLtvAndLiqThreshold(
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
-      publicKey(
-        findMarginfiAccounts({
-          mint: supply.mint.toString(),
-        }).bank
-      )
+      publicKey(MARGINFI_ACCOUNTS[supply.mint.toString()].bank)
     );
   }
 
-  if ((!debt.bank || debt.bank === null) && !debt.mint.equals(PublicKey.default)) {
+  if (
+    (!debt.bank || debt.bank === null) &&
+    !debt.mint.equals(PublicKey.default)
+  ) {
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
-        findMarginfiAccounts({
-          mint: debt.mint.toString(),
-        }).bank
+        MARGINFI_ACCOUNTS[debt.mint.toString()].bank
       )
     );
   }
@@ -248,14 +238,14 @@ export async function getMarginfiAccountPositionState(
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(findMarginfiAccounts({ mint: supplyMint.toString() }).bank)
+          publicKey(MARGINFI_ACCOUNTS[supplyMint.toString()].bank)
         )
       : null;
   let debtBank: Bank | null =
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(findMarginfiAccounts({ mint: debtMint.toString() }).bank)
+          publicKey(MARGINFI_ACCOUNTS[debtMint.toString()].bank)
         )
       : null;
 

package/src/utils/numberUtils.ts

@@ -1,4 +1,5 @@
 import { MAX_REPAY_GAP_BPS } from "../constants";
+import { FeeType } from "../generated";
 
 export function getLiqUtilzationRateBps(
   supplyUsd: number,
@@ -88,7 +89,7 @@ export function getDebtAdjustmentUsd(
 
 export function getSolautoFeesBps(
   isReferred: boolean,
-  selfManaged: boolean,
+  feeType: FeeType,
   positionNetWorthUsd: number
 ): {
   solauto: number;
@@ -101,7 +102,7 @@ export function getSolautoFeesBps(
   const minFeeBps = 100; // Fee in basis points for maxSize (1%)
 
   let feeBps: number = 0;
-  if (selfManaged) {
+  if (feeType === FeeType.Small) {
     feeBps = 100;
   } else if (positionNetWorthUsd <= minSize) {
     feeBps = maxFeeBps;

package/src/utils/solauto/generalUtils.ts

@@ -23,7 +23,7 @@ import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ALL_SUPPORTED_TOKENS,
-  TOKEN_DECIMALS,
+  TOKEN_INFO,
   USD_DECIMALS,
 } from "../../constants";
 import {
@@ -368,8 +368,8 @@ export function createFakePositionState(
   maxLtvBps: number,
   liqThresholdBps: number
 ): PositionState {
-  const supplyDecimals = TOKEN_DECIMALS[supply.mint.toString()];
-  const debtDecimals = TOKEN_DECIMALS[debt.mint.toString()];
+  const supplyDecimals = TOKEN_INFO[supply.mint.toString()].decimals;
+  const debtDecimals = TOKEN_INFO[debt.mint.toString()].decimals;
 
   const supplyUsd = supply.amountUsed * supply.price;
   const debtUsd = debt.amountUsed * debt.price;

package/src/utils/solauto/rebalanceUtils.ts

@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
 import {
   DCASettings,
+  FeeType,
   PositionState,
   PositionTokenUsage,
   SolautoSettingsParameters,
@@ -170,6 +171,7 @@ export function getRebalanceValues(
   state: PositionState,
   settings: SolautoSettingsParameters | undefined,
   dca: DCASettings | undefined,
+  feeType: FeeType,
   currentUnixTime: number,
   supplyPrice: number,
   debtPrice: number,
@@ -204,7 +206,7 @@ export function getRebalanceValues(
   if (increasingLeverage) {
     adjustmentFeeBps = getSolautoFeesBps(
       false,
-      settings === undefined,
+      feeType,
       fromBaseUnit(state.netWorth.baseAmountUsdValue, USD_DECIMALS)
     ).total;
   }

package/tests/transactions/solautoMarginfi.ts

@@ -5,12 +5,11 @@ import {
   SolautoMarginfiClient,
 } from "../../src/clients/solautoMarginfiClient";
 import {
-  LendingPlatform,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import { getMaxLiqUtilizationRateBps, toBaseUnit } from "../../src/utils/numberUtils";
+import { maxBoostToBps, maxRepayFromBps, maxRepayToBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -21,12 +20,12 @@ import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const useJitoBundle = false;
-  const positionId = 1;
+  const positionId = 2;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
@@ -67,22 +66,26 @@ describe("Solauto Marginfi tests", async () => {
     //     }, "open position")
     //   );
 
-    //   const initialSupplyUsd = 50;
-    //   transactionItems.push(
-    //     new TransactionItem(async () => {
-    //       const [supplyPrice] = await getTokenPrices([supply]);
-    //       return {
-    //         tx: client.protocolInteraction(
-    //           solautoAction("Deposit", [
-    //             toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
-    //           ])
-    //         ),
-    //       };
-    //     }, "deposit")
-    //   );
+      // const initialSupplyUsd = 150;
+      // transactionItems.push(
+      //   new TransactionItem(async () => {
+      //     const [supplyPrice] = await getTokenPrices([supply]);
+      //     return {
+      //       tx: client.protocolInteraction(
+      //         solautoAction("Deposit", [
+      //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+      //         ])
+      //       ),
+      //     };
+      //   }, "deposit")
+      // );
     // }
 
-    // const maxLiqRate = getMaxLiqUtilizationRateBps(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
+    // const maxLtvBps = client.solautoPositionState!.maxLtvBps;
+    // const liqThresholdBps = client.solautoPositionState!.liqThresholdBps;
+    // const maxRepayFrom = maxRepayFromBps(maxLtvBps, liqThresholdBps);
+    // const maxRepayTo = maxRepayToBps(maxLtvBps, liqThresholdBps);
+    // const maxBoostTo = maxBoostToBps(maxLtvBps, liqThresholdBps);
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
@@ -90,10 +93,10 @@ describe("Solauto Marginfi tests", async () => {
     //         positionId: client.positionId,
     //         settingParams: some({
     //           ...settingParams,
+    //           boostToBps: maxBoostTo,
     //           boostGap: 50,
-    //           boostToBps: maxLiqRate,
-    //           repayGap: 100,
-    //           repayToBps: maxLiqRate
+    //           repayToBps: maxRepayTo,
+    //           repayGap: maxRepayFrom - maxRepayTo
     //         }),
     //         dca: null,
     //       }),

package/tests/unit/rebalanceCalculations.ts

@@ -9,6 +9,7 @@ import { publicKey } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../../src/clients/solautoClient";
 import {
   DCASettings,
+  FeeType,
   LendingPlatform,
   SolautoRebalanceType,
   SolautoSettingsParameters,
@@ -48,6 +49,7 @@ function assertAccurateRebalance(
       client.solautoPositionState!,
       client.solautoPositionSettings(),
       client.solautoPositionActiveDca(),
+      client.solautoPositionData!.feeType,
       currentUnixSeconds(),
       PRICES[client.supplyMint.toString()].price,
       PRICES[client.debtMint.toString()].price,
@@ -58,7 +60,7 @@ function assertAccurateRebalance(
   if (increasingLeverage) {
     adjustmentFeeBps = getSolautoFeesBps(
       client.referredByState !== undefined,
-      client.selfManaged,
+      client.solautoPositionData!.feeType,
       fromBaseUnit(
         client.solautoPositionState?.netWorth.baseAmountUsdValue ?? BigInt(0),
         USD_DECIMALS
@@ -178,7 +180,9 @@ async function getFakePosition(
       padding2: [],
       padding: new Uint8Array([]),
     },
+    feeType: FeeType.Default,
     padding1: [],
+    padding2: [],
     padding: [],
     publicKey: publicKey(PublicKey.default),
     header: {