@haven-fi/solauto-sdk 1.0.146 → 1.0.148

package/dist/clients/referralStateManager.d.ts

@@ -15,7 +15,7 @@ export declare class ReferralStateManager extends TxHandler {
     referralAuthority: PublicKey;
     referralState: PublicKey;
     referralStateData: ReferralState | null;
-    constructor(heliusApiKey: string, localTest?: boolean | undefined);
+    constructor(heliusApiUrl: string, localTest?: boolean | undefined);
     initialize(args: ReferralStateManagerArgs): Promise<void>;
     defaultLookupTables(): string[];
     updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;

package/dist/clients/referralStateManager.js

@@ -9,8 +9,8 @@ const generated_1 = require("../generated");
 const utils_1 = require("../utils");
 const txHandler_1 = require("./txHandler");
 class ReferralStateManager extends txHandler_1.TxHandler {
-    constructor(heliusApiKey, localTest) {
-        super(heliusApiKey, localTest);
+    constructor(heliusApiUrl, localTest) {
+        super(heliusApiUrl, localTest);
         this.localTest = localTest;
         this.umi = this.umi.use({
             install(umi) {

package/dist/clients/solautoClient.d.ts

@@ -41,7 +41,7 @@ export declare abstract class SolautoClient extends TxHandler {
     solautoFeesSupplyTa: PublicKey;
     authorityLutAddress?: PublicKey;
     livePositionUpdates: LivePositionUpdates;
-    constructor(heliusApiKey: string, localTest?: boolean | undefined);
+    constructor(heliusApiUrl: string, localTest?: boolean | undefined);
     initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform): Promise<void>;
     resetLiveTxUpdates(success?: boolean): Promise<void>;
     abstract protocolAccount(): PublicKey;

package/dist/clients/solautoClient.js

@@ -16,8 +16,8 @@ const generalUtils_2 = require("../utils/solauto/generalUtils");
 const referralStateManager_1 = require("./referralStateManager");
 const txHandler_1 = require("./txHandler");
 class SolautoClient extends txHandler_1.TxHandler {
-    constructor(heliusApiKey, localTest) {
-        super(heliusApiKey, localTest);
+    constructor(heliusApiUrl, localTest) {
+        super(heliusApiUrl, localTest);
         this.localTest = localTest;
         this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
         this.umi = this.umi.use({
@@ -55,7 +55,7 @@ class SolautoClient extends txHandler_1.TxHandler {
                     : web3_js_1.PublicKey.default);
         this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
         this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
-        this.referralStateManager = new referralStateManager_1.ReferralStateManager(this.heliusApiKey);
+        this.referralStateManager = new referralStateManager_1.ReferralStateManager(this.heliusApiUrl);
         await this.referralStateManager.initialize({
             referralAuthority: this.authority,
             signer: args.signer,

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;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;AAWnE,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;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAmE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,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;IA6C9B,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,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA0DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4BlE"}
+{"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,EAEb,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;AAWnE,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;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAmE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,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;IA+C9B,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,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA0DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4BlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -109,7 +109,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             .openPosition(settingParams, dca)
             .add(this.marginfiOpenPositionIx(settingParams, dca));
     }
-    marginfiOpenPositionIx(settingParams, dca) {
+    marginfiOpenPositionIx(settingParams, dca, positionType) {
         let signerDebtTa = undefined;
         if (dca) {
             signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
@@ -138,6 +138,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: signerDebtTa,
+            positionType: positionType ?? generated_1.PositionType.Leverage,
             positionData: {
                 positionId: this.positionId,
                 settingParams: settingParams ?? null,

package/dist/clients/txHandler.d.ts

@@ -2,10 +2,10 @@ import { Umi } from "@metaplex-foundation/umi";
 import { Connection } from "@solana/web3.js";
 export declare abstract class TxHandler {
     localTest?: boolean | undefined;
-    heliusApiKey: string;
+    heliusApiUrl: string;
     umi: Umi;
     connection: Connection;
-    constructor(heliusApiKey: string, localTest?: boolean | undefined);
+    constructor(heliusApiUrl: string, localTest?: boolean | undefined);
     log(...args: any[]): void;
     abstract defaultLookupTables(): string[];
     abstract resetLiveTxUpdates(success?: boolean): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,8BAAsB,SAAS;IAMpB,SAAS,CAAC,EAAE,OAAO;IALrB,YAAY,EAAG,MAAM,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAEnB,YAAY,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,OAAO,YAAA;IAO5B,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,8BAAsB,SAAS;IAOpB,SAAS,CAAC,EAAE,OAAO;IANrB,YAAY,EAAG,MAAM,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAG7B,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAQ5B,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}

package/dist/clients/txHandler.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxHandler = void 0;
 const utils_1 = require("../utils");
 class TxHandler {
-    constructor(heliusApiKey, localTest) {
+    constructor(heliusApiUrl, localTest) {
         this.localTest = localTest;
-        this.heliusApiKey = heliusApiKey;
-        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.heliusApiKey);
+        this.heliusApiUrl = heliusApiUrl;
+        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.heliusApiUrl);
         this.connection = connection;
         this.umi = umi;
     }

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

@@ -7,12 +7,13 @@
  */
 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 { PodBool, PodBoolArgs, PositionData, PositionDataArgs, PositionState, PositionStateArgs, PositionType, PositionTypeArgs, RebalanceData, RebalanceDataArgs } from '../types';
 export type SolautoPosition = Account<SolautoPositionAccountData>;
 export type SolautoPositionAccountData = {
     bump: Array<number>;
     positionId: Array<number>;
     selfManaged: PodBool;
+    positionType: PositionType;
     padding1: Array<number>;
     authority: PublicKey;
     position: PositionData;
@@ -24,6 +25,7 @@ export type SolautoPositionAccountDataArgs = {
     bump: Array<number>;
     positionId: Array<number>;
     selfManaged: PodBoolArgs;
+    positionType: PositionTypeArgs;
     padding1: Array<number>;
     authority: PublicKey;
     position: PositionDataArgs;
@@ -41,6 +43,7 @@ export declare function getSolautoPositionGpaBuilder(context: Pick<Context, 'rpc
     bump: Array<number>;
     positionId: Array<number>;
     selfManaged: PodBoolArgs;
+    positionType: PositionTypeArgs;
     padding1: Array<number>;
     authority: PublicKey;
     position: PositionDataArgs;

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":"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"}

package/dist/generated/accounts/solautoPosition.js

@@ -23,7 +23,8 @@ function getSolautoPositionAccountDataSerializer() {
         ['bump', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 1 })],
         ['positionId', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 1 })],
         ['selfManaged', (0, types_1.getPodBoolSerializer)()],
-        ['padding1', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 5 })],
+        ['positionType', (0, types_1.getPositionTypeSerializer)()],
+        ['padding1', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 4 })],
         ['authority', (0, serializers_1.publicKey)()],
         ['position', (0, types_1.getPositionDataSerializer)()],
         ['state', (0, types_1.getPositionStateSerializer)()],
@@ -63,7 +64,8 @@ function getSolautoPositionGpaBuilder(context) {
         bump: [0, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 1 })],
         positionId: [1, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 1 })],
         selfManaged: [2, (0, types_1.getPodBoolSerializer)()],
-        padding1: [3, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 5 })],
+        positionType: [3, (0, types_1.getPositionTypeSerializer)()],
+        padding1: [4, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 4 })],
         authority: [8, (0, serializers_1.publicKey)()],
         position: [40, (0, types_1.getPositionDataSerializer)()],
         state: [360, (0, types_1.getPositionStateSerializer)()],

package/dist/generated/instructions/marginfiOpenPosition.d.ts

@@ -7,7 +7,7 @@
  */
 import { Context, Option, OptionOrNullable, Pda, PublicKey, Signer, TransactionBuilder } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { UpdatePositionData, UpdatePositionDataArgs } from '../types';
+import { PositionType, PositionTypeArgs, UpdatePositionData, UpdatePositionDataArgs } from '../types';
 export type MarginfiOpenPositionInstructionAccounts = {
     signer: Signer;
     marginfiProgram: PublicKey | Pda;
@@ -33,10 +33,12 @@ export type MarginfiOpenPositionInstructionAccounts = {
 };
 export type MarginfiOpenPositionInstructionData = {
     discriminator: number;
+    positionType: PositionType;
     positionData: UpdatePositionData;
     marginfiAccountSeedIdx: Option<bigint>;
 };
 export type MarginfiOpenPositionInstructionDataArgs = {
+    positionType: PositionTypeArgs;
     positionData: UpdatePositionDataArgs;
     marginfiAccountSeedIdx: OptionOrNullable<number | bigint>;
 };

package/dist/generated/instructions/marginfiOpenPosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiOpenPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiOpenPosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,uCAAuC,GAAG;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1C,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,mCAAmC,GAAG;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,kBAAkB,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG;IACpD,YAAY,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,gDAAgD,IAAI,UAAU,CAC5E,uCAAuC,EACvC,mCAAmC,CACpC,CAmBA;AAGD,MAAM,MAAM,mCAAmC,GAC7C,uCAAuC,CAAC;AAG1C,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,uCAAuC,GAC5C,mCAAmC,GACpC,kBAAkB,CAsKpB"}
+{"version":3,"file":"marginfiOpenPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiOpenPosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,uCAAuC,GAAG;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1C,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,mCAAmC,GAAG;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,kBAAkB,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG;IACpD,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,gDAAgD,IAAI,UAAU,CAC5E,uCAAuC,EACvC,mCAAmC,CACpC,CAoBA;AAGD,MAAM,MAAM,mCAAmC,GAC7C,uCAAuC,CAAC;AAG1C,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,uCAAuC,GAC5C,mCAAmC,GACpC,kBAAkB,CAsKpB"}

package/dist/generated/instructions/marginfiOpenPosition.js

@@ -16,6 +16,7 @@ const types_1 = require("../types");
 function getMarginfiOpenPositionInstructionDataSerializer() {
     return (0, serializers_1.mapSerializer)((0, serializers_1.struct)([
         ['discriminator', (0, serializers_1.u8)()],
+        ['positionType', (0, types_1.getPositionTypeSerializer)()],
         ['positionData', (0, types_1.getUpdatePositionDataSerializer)()],
         ['marginfiAccountSeedIdx', (0, serializers_1.option)((0, serializers_1.u64)())],
     ], { description: 'MarginfiOpenPositionInstructionData' }), (value) => ({ ...value, discriminator: 6 }));

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

@@ -14,6 +14,7 @@ export * from './podBool';
 export * from './positionData';
 export * from './positionState';
 export * from './positionTokenUsage';
+export * from './positionType';
 export * from './rebalanceData';
 export * from './solautoAction';
 export * from './solautoRebalanceType';

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,aAAa,CAAC;AAC5B,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,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,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,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}

package/dist/generated/types/index.js

@@ -30,6 +30,7 @@ __exportStar(require("./podBool"), exports);
 __exportStar(require("./positionData"), exports);
 __exportStar(require("./positionState"), exports);
 __exportStar(require("./positionTokenUsage"), exports);
+__exportStar(require("./positionType"), exports);
 __exportStar(require("./rebalanceData"), exports);
 __exportStar(require("./solautoAction"), exports);
 __exportStar(require("./solautoRebalanceType"), exports);

package/dist/generated/types/positionType.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 PositionType {
+    Leverage = 0,
+    SafeLoan = 1
+}
+export type PositionTypeArgs = PositionType;
+export declare function getPositionTypeSerializer(): Serializer<PositionTypeArgs, PositionType>;
+//# sourceMappingURL=positionType.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"positionType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/positionType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,YAAY;IACtB,QAAQ,IAAA;IACR,QAAQ,IAAA;CACT;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE5C,wBAAgB,yBAAyB,IAAI,UAAU,CACrD,gBAAgB,EAChB,YAAY,CACb,CAIA"}

package/dist/generated/types/positionType.js

@@ -0,0 +1,22 @@
+"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.PositionType = void 0;
+exports.getPositionTypeSerializer = getPositionTypeSerializer;
+const serializers_1 = require("@metaplex-foundation/umi/serializers");
+var PositionType;
+(function (PositionType) {
+    PositionType[PositionType["Leverage"] = 0] = "Leverage";
+    PositionType[PositionType["SafeLoan"] = 1] = "SafeLoan";
+})(PositionType || (exports.PositionType = PositionType = {}));
+function getPositionTypeSerializer() {
+    return (0, serializers_1.scalarEnum)(PositionType, {
+        description: 'PositionType',
+    });
+}

package/dist/types/solauto.d.ts

@@ -1,9 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
-import { LendingPlatform } from "../generated";
+import { LendingPlatform, PositionType } from "../generated";
 export interface SolautoPositionDetails {
     publicKey?: PublicKey;
     authority: PublicKey;
     positionId: number;
+    positionType: PositionType;
     lendingPlatform: LendingPlatform;
     protocolAccount?: PublicKey;
     supplyMint?: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC"}

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;AAE7D,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,CAiE3B;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,CAkJpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
+{"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;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,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,CA+D3B;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,CAwDA;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,CAsJpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}

package/dist/utils/marginfiUtils.js

@@ -81,6 +81,8 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
             state: await getMarginfiAccountPositionState(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey)),
         })));
         return positionStates
+            .sort((a, b) => (0, numberUtils_1.fromBaseUnit)(b.state?.netWorth.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS) -
+            (0, numberUtils_1.fromBaseUnit)(a.state?.netWorth.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS))
             .filter((x) => x.state !== undefined)
             .map((x) => ({
             marginfiAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
@@ -153,7 +155,9 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
         }
         if (supplyBalances.length > 0) {
             if (supplyBank === null) {
-                supplyBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, supplyBalances[0].bankPk, { commitment: "confirmed" });
+                supplyBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, supplyBalances[0].bankPk, {
+                    commitment: "confirmed",
+                });
             }
             if (!supplyMint) {
                 supplyMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint);
@@ -162,7 +166,9 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
-                debtBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, debtBalances[0].bankPk, { commitment: "confirmed" });
+                debtBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, debtBalances[0].bankPk, {
+                    commitment: "confirmed",
+                });
             }
             if (!debtMint) {
                 debtMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(debtBank.mint);

package/dist/utils/solanaUtils.d.ts

@@ -1,7 +1,8 @@
 import { AddressLookupTableInput, Signer, TransactionBuilder, Umi, WrappedInstruction } from "@metaplex-foundation/umi";
 import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
-export declare function getSolanaRpcConnection(heliusApiKey: string): [Connection, Umi];
+export declare function buildHeliusApiUrl(heliusApiKey: string): string;
+export declare function getSolanaRpcConnection(rpcUrl: string): [Connection, Umi];
 export declare function getWrappedInstruction(signer: Signer, ix: TransactionInstruction): WrappedInstruction;
 export declare function setComputeUnitLimitUmiIx(signer: Signer, maxComputeUnits: number): WrappedInstruction;
 export declare function setComputeUnitPriceUmiIx(signer: Signer, lamports: number): WrappedInstruction;

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,GACnB,CAAC,UAAU,EAAE,GAAG,CAAC,CAOnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA8DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAGL,UAAU,EACV,SAAS,EAIT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAElE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GACb,CAAC,UAAU,EAAE,GAAG,CAAC,CAInB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,MAAM,sBA4D1B;AAmBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,eAAe,GAAE,kBAA+C,EAChE,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA8DjC"}

package/dist/utils/solanaUtils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildHeliusApiUrl = buildHeliusApiUrl;
 exports.getSolanaRpcConnection = getSolanaRpcConnection;
 exports.getWrappedInstruction = getWrappedInstruction;
 exports.setComputeUnitLimitUmiIx = setComputeUnitLimitUmiIx;
@@ -25,8 +26,11 @@ const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const types_1 = require("../types");
-function getSolanaRpcConnection(heliusApiKey) {
-    const connection = new web3_js_1.Connection(`https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`, "confirmed");
+function buildHeliusApiUrl(heliusApiKey) {
+    return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
+}
+function getSolanaRpcConnection(rpcUrl) {
+    const connection = new web3_js_1.Connection(rpcUrl, "confirmed");
     const umi = (0, umi_bundle_defaults_1.createUmi)(connection);
     return [connection, umi];
 }

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

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
+import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 export declare function findMintByTicker(ticker: string): PublicKey;
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
@@ -9,10 +9,10 @@ export declare function getUpdatedValueFromAutomation(currValue: number, targetV
 export declare function getAdjustedSettingsFromAutomation(settings: SolautoSettingsParameters, currentUnixTime: number): SolautoSettingsParameters;
 export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings | undefined, currentUnixTime: number, bpsDistanceThreshold?: number): RebalanceAction | undefined;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters, currentUnixTime: number): boolean;
-export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<SolautoPositionDetails[]>;
+export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
 export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;
 export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
-export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey): Promise<SolautoPositionDetails[]>;
+export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;
 export declare function positionStateWithLatestPrices(state: PositionState, supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
 interface AssetProps {
     mint: PublicKey;

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

@@ -98,11 +98,12 @@ function eligibleForRefresh(positionState, positionSettings, currentUnixTime) {
             60 * 60 * 24 * 7);
     }
 }
-async function getSolautoManagedPositions(umi, authority) {
+async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
     // bump: [u8; 1]
     // position_id: [u8; 1]
     // self_managed: u8 - (1 for true, 0 for false)
-    // padding: [u8; 5]
+    // position_type: PositionType
+    // padding: [u8; 4]
     // authority: pubkey
     // lending_platform: u8
     // padding: [u8; 7]
@@ -113,7 +114,7 @@ async function getSolautoManagedPositions(umi, authority) {
         commitment: "confirmed",
         dataSlice: {
             offset: 0,
-            length: 1 + 1 + 1 + 5 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + padding (5) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
+            length: 1 + 1 + 1 + 1 + 4 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + position_type + padding (4) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
         },
         filters: [
             {
@@ -135,6 +136,14 @@ async function getSolautoManagedPositions(umi, authority) {
                     },
                 ]
                 : []),
+            ...(positionTypeFilter !== undefined ? [
+                {
+                    memcmp: {
+                        bytes: new Uint8Array(positionTypeFilter),
+                        offset: 3
+                    }
+                }
+            ] : [])
         ],
     });
     return accounts.map((x) => {
@@ -147,6 +156,7 @@ async function getSolautoManagedPositions(umi, authority) {
             authority: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.authority),
             positionId: position.positionId[0],
             lendingPlatform: position.position.lendingPlatform,
+            positionType: position.positionType,
             protocolAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolAccount),
             supplyMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.supplyMint),
             debtMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.debtMint),
@@ -194,16 +204,19 @@ async function getReferralsByUser(umi, user) {
     });
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
-async function getAllPositionsByAuthority(umi, user) {
+async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
     const solautoCompatiblePositions = await Promise.all([
         (async () => {
-            const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
+            const solautoManagedPositions = await getSolautoManagedPositions(umi, user, positionTypeFilter);
             return solautoManagedPositions.map((x) => ({
                 ...x,
                 authority: user,
             }));
         })(),
         (async () => {
+            if (positionTypeFilter === generated_1.PositionType.SafeLoan) {
+                return [];
+            }
             let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
             marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
                 (x.debtMint.equals(web3_js_1.PublicKey.default) ||
@@ -212,6 +225,7 @@ async function getAllPositionsByAuthority(umi, user) {
                 publicKey: x.marginfiAccount,
                 authority: user,
                 positionId: 0,
+                positionType: generated_1.PositionType.Leverage,
                 lendingPlatform: generated_1.LendingPlatform.Marginfi,
                 protocolAccount: x.marginfiAccount,
                 supplyMint: x.supplyMint,

package/local/createSolautoManagerAccount.ts

@@ -5,6 +5,7 @@ import {
   transactionBuilder,
 } from "@metaplex-foundation/umi";
 import {
+  buildHeliusApiUrl,
   getSolanaRpcConnection,
   sendSingleOptimizedTransaction,
 } from "../src/utils/solanaUtils";
@@ -14,7 +15,7 @@ import { getSecretKey } from "./shared";
 import { updateSolautoLut } from "./updateSolautoLUT";
 
 async function create() {
-  let [connection, umi] = getSolanaRpcConnection(process.env.HELIUS_API_KEY!);
+  let [connection, umi] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY!));
 
   const secretKey = getSecretKey("solauto-manager");
   const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);

package/local/shared.ts

@@ -8,7 +8,7 @@ import {
   VersionedTransaction,
   PublicKey,
 } from "@solana/web3.js";
-import { getSolanaRpcConnection } from "../src/utils/solanaUtils";
+import { buildHeliusApiUrl, getSolanaRpcConnection } from "../src/utils/solanaUtils";
 
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
@@ -22,7 +22,7 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
 }
 
 const keypair = Keypair.fromSecretKey(getSecretKey());
-const [connection, _] = getSolanaRpcConnection(process.env.HELIUS_API_KEY ?? "");
+const [connection, _] = getSolanaRpcConnection(buildHeliusApiUrl(process.env.HELIUS_API_KEY ?? ""));
 
 async function createAndSendV0Tx(txInstructions: TransactionInstruction[]) {
   let latestBlockhash = await connection.getLatestBlockhash("finalized");

package/package.json

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

package/src/clients/referralStateManager.ts

@@ -21,8 +21,8 @@ export class ReferralStateManager extends TxHandler {
     public referralState!: PublicKey;
     public referralStateData!: ReferralState | null;
 
-    constructor(heliusApiKey: string, public localTest?: boolean) {
-        super(heliusApiKey, localTest)
+    constructor(heliusApiUrl: string, public localTest?: boolean) {
+        super(heliusApiUrl, localTest)
         this.umi = this.umi.use({
             install(umi) {
                 umi.programs.add(createSolautoProgram(), false);

package/src/clients/solautoClient.ts

@@ -100,10 +100,10 @@ export abstract class SolautoClient extends TxHandler {
   public livePositionUpdates: LivePositionUpdates = new LivePositionUpdates();
 
   constructor(
-    heliusApiKey: string,
+    heliusApiUrl: string,
     public localTest?: boolean
   ) {
-    super(heliusApiKey, localTest);
+    super(heliusApiUrl, localTest);
 
     this.umi = this.umi.use({
       install(umi) {
@@ -164,7 +164,7 @@ export abstract class SolautoClient extends TxHandler {
       this.debtMint
     );
 
-    this.referralStateManager = new ReferralStateManager(this.heliusApiKey);
+    this.referralStateManager = new ReferralStateManager(this.heliusApiUrl);
     await this.referralStateManager.initialize({
       referralAuthority: this.authority,
       signer: args.signer,

package/src/clients/solautoMarginfiClient.ts

@@ -23,6 +23,7 @@ import {
   DCASettingsInpArgs,
   LendingPlatform,
   PositionState,
+  PositionType,
   SolautoActionArgs,
   SolautoRebalanceTypeArgs,
   SolautoSettingsParametersInpArgs,
@@ -232,7 +233,8 @@ export class SolautoMarginfiClient extends SolautoClient {
 
   private marginfiOpenPositionIx(
     settingParams?: SolautoSettingsParametersInpArgs,
-    dca?: DCASettingsInpArgs
+    dca?: DCASettingsInpArgs,
+    positionType?: PositionType
   ): TransactionBuilder {
     let signerDebtTa: UmiPublicKey | undefined = undefined;
     if (dca) {
@@ -264,6 +266,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: signerDebtTa,
+      positionType: positionType ?? PositionType.Leverage,
       positionData: {
         positionId: this.positionId!,
         settingParams: settingParams ?? null,

package/src/clients/txHandler.ts

@@ -2,18 +2,19 @@ import { Umi } from "@metaplex-foundation/umi";
 import { Connection } from "@solana/web3.js";
 import { getSolanaRpcConnection } from "../utils";
 
-
 export abstract class TxHandler {
-  public heliusApiKey!: string;
+  public heliusApiUrl!: string;
   public umi!: Umi;
   public connection!: Connection;
 
-  constructor(heliusApiKey: string,
-    public localTest?: boolean) {
-      this.heliusApiKey = heliusApiKey;
-      const [connection, umi] = getSolanaRpcConnection(this.heliusApiKey);
-      this.connection = connection;
-      this.umi = umi;
+  constructor(
+    heliusApiUrl: string,
+    public localTest?: boolean
+  ) {
+    this.heliusApiUrl = heliusApiUrl;
+    const [connection, umi] = getSolanaRpcConnection(this.heliusApiUrl);
+    this.connection = connection;
+    this.umi = umi;
   }
 
   log(...args: any[]): void {
@@ -25,4 +26,4 @@ export abstract class TxHandler {
   abstract defaultLookupTables(): string[];
 
   abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
-}
+}

package/src/generated/accounts/solautoPosition.ts

@@ -34,11 +34,14 @@ import {
   PositionDataArgs,
   PositionState,
   PositionStateArgs,
+  PositionType,
+  PositionTypeArgs,
   RebalanceData,
   RebalanceDataArgs,
   getPodBoolSerializer,
   getPositionDataSerializer,
   getPositionStateSerializer,
+  getPositionTypeSerializer,
   getRebalanceDataSerializer,
 } from '../types';
 
@@ -48,6 +51,7 @@ export type SolautoPositionAccountData = {
   bump: Array<number>;
   positionId: Array<number>;
   selfManaged: PodBool;
+  positionType: PositionType;
   padding1: Array<number>;
   authority: PublicKey;
   position: PositionData;
@@ -60,6 +64,7 @@ export type SolautoPositionAccountDataArgs = {
   bump: Array<number>;
   positionId: Array<number>;
   selfManaged: PodBoolArgs;
+  positionType: PositionTypeArgs;
   padding1: Array<number>;
   authority: PublicKey;
   position: PositionDataArgs;
@@ -77,7 +82,8 @@ export function getSolautoPositionAccountDataSerializer(): Serializer<
       ['bump', array(u8(), { size: 1 })],
       ['positionId', array(u8(), { size: 1 })],
       ['selfManaged', getPodBoolSerializer()],
-      ['padding1', array(u8(), { size: 5 })],
+      ['positionType', getPositionTypeSerializer()],
+      ['padding1', array(u8(), { size: 4 })],
       ['authority', publicKeySerializer()],
       ['position', getPositionDataSerializer()],
       ['state', getPositionStateSerializer()],
@@ -165,6 +171,7 @@ export function getSolautoPositionGpaBuilder(
       bump: Array<number>;
       positionId: Array<number>;
       selfManaged: PodBoolArgs;
+      positionType: PositionTypeArgs;
       padding1: Array<number>;
       authority: PublicKey;
       position: PositionDataArgs;
@@ -175,7 +182,8 @@ export function getSolautoPositionGpaBuilder(
       bump: [0, array(u8(), { size: 1 })],
       positionId: [1, array(u8(), { size: 1 })],
       selfManaged: [2, getPodBoolSerializer()],
-      padding1: [3, array(u8(), { size: 5 })],
+      positionType: [3, getPositionTypeSerializer()],
+      padding1: [4, array(u8(), { size: 4 })],
       authority: [8, publicKeySerializer()],
       position: [40, getPositionDataSerializer()],
       state: [360, getPositionStateSerializer()],

package/src/generated/instructions/marginfiOpenPosition.ts

@@ -31,8 +31,11 @@ import {
   getAccountMetasAndSigners,
 } from '../shared';
 import {
+  PositionType,
+  PositionTypeArgs,
   UpdatePositionData,
   UpdatePositionDataArgs,
+  getPositionTypeSerializer,
   getUpdatePositionDataSerializer,
 } from '../types';
 
@@ -64,11 +67,13 @@ export type MarginfiOpenPositionInstructionAccounts = {
 // Data.
 export type MarginfiOpenPositionInstructionData = {
   discriminator: number;
+  positionType: PositionType;
   positionData: UpdatePositionData;
   marginfiAccountSeedIdx: Option<bigint>;
 };
 
 export type MarginfiOpenPositionInstructionDataArgs = {
+  positionType: PositionTypeArgs;
   positionData: UpdatePositionDataArgs;
   marginfiAccountSeedIdx: OptionOrNullable<number | bigint>;
 };
@@ -85,6 +90,7 @@ export function getMarginfiOpenPositionInstructionDataSerializer(): Serializer<
     struct<MarginfiOpenPositionInstructionData>(
       [
         ['discriminator', u8()],
+        ['positionType', getPositionTypeSerializer()],
         ['positionData', getUpdatePositionDataSerializer()],
         ['marginfiAccountSeedIdx', option(u64())],
       ],

package/src/generated/types/index.ts

@@ -15,6 +15,7 @@ export * from './podBool';
 export * from './positionData';
 export * from './positionState';
 export * from './positionTokenUsage';
+export * from './positionType';
 export * from './rebalanceData';
 export * from './solautoAction';
 export * from './solautoRebalanceType';

package/src/generated/types/positionType.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 PositionType {
+  Leverage,
+  SafeLoan,
+}
+
+export type PositionTypeArgs = PositionType;
+
+export function getPositionTypeSerializer(): Serializer<
+  PositionTypeArgs,
+  PositionType
+> {
+  return scalarEnum<PositionType>(PositionType, {
+    description: 'PositionType',
+  }) as Serializer<PositionTypeArgs, PositionType>;
+}

package/src/types/solauto.ts

@@ -1,10 +1,11 @@
 import { PublicKey } from "@solana/web3.js";
-import { LendingPlatform } from "../generated";
+import { LendingPlatform, PositionType } from "../generated";
 
 export interface SolautoPositionDetails {
   publicKey?: PublicKey;
   authority: PublicKey;
   positionId: number;
+  positionType: PositionType;
   lendingPlatform: LendingPlatform;
   protocolAccount?: PublicKey;
   supplyMint?: PublicKey;

package/src/utils/marginfiUtils.ts

@@ -8,7 +8,11 @@ import {
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
-import { currentUnixSeconds, fetchTokenPrices, safeGetPrice } from "./generalUtils";
+import {
+  currentUnixSeconds,
+  fetchTokenPrices,
+  safeGetPrice,
+} from "./generalUtils";
 import {
   bytesToI80F48,
   fromBaseUnit,
@@ -64,9 +68,7 @@ export async function getMaxLtvAndLiqThreshold(
   ) {
     debt.bank = await safeFetchBank(
       umi,
-      publicKey(
-        MARGINFI_ACCOUNTS[debt.mint.toString()].bank
-      ),
+      publicKey(MARGINFI_ACCOUNTS[debt.mint.toString()].bank),
       { commitment: "confirmed" }
     );
   }
@@ -94,7 +96,7 @@ export async function getMaxLtvAndLiqThreshold(
       BigInt(
         Math.round(
           bytesToI80F48(supply.bank!.totalAssetShares.value) *
-          bytesToI80F48(supply.bank!.assetShareValue.value)
+            bytesToI80F48(supply.bank!.assetShareValue.value)
         )
       ),
       supply.bank!.mintDecimals
@@ -152,6 +154,17 @@ export async function getAllMarginfiAccountsByAuthority(
       }))
     );
     return positionStates
+      .sort(
+        (a, b) =>
+          fromBaseUnit(
+            b.state?.netWorth.baseAmountUsdValue ?? BigInt(0),
+            USD_DECIMALS
+          ) -
+          fromBaseUnit(
+            a.state?.netWorth.baseAmountUsdValue ?? BigInt(0),
+            USD_DECIMALS
+          )
+      )
       .filter((x) => x.state !== undefined)
       .map((x) => ({
         marginfiAccount: toWeb3JsPublicKey(x.publicKey),
@@ -190,7 +203,7 @@ async function getTokenUsage(
     amountCanBeUsed = isAsset
       ? Number(bank.config.depositLimit) - totalDeposited
       : totalDeposited -
-      bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
+        bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
   }
 
   return {
@@ -200,22 +213,22 @@ async function getTokenUsage(
       baseUnit: BigInt(Math.round(amountUsed)),
       baseAmountUsdValue: bank
         ? toBaseUnit(
-          fromBaseUnit(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
-          marketPrice,
-          USD_DECIMALS
-        )
+            fromBaseUnit(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
+              marketPrice,
+            USD_DECIMALS
+          )
         : BigInt(0),
     },
     amountCanBeUsed: {
       baseUnit: BigInt(Math.round(amountCanBeUsed)),
       baseAmountUsdValue: bank
         ? toBaseUnit(
-          fromBaseUnit(
-            BigInt(Math.round(amountCanBeUsed)),
-            bank.mintDecimals
-          ) * marketPrice,
-          USD_DECIMALS
-        )
+            fromBaseUnit(
+              BigInt(Math.round(amountCanBeUsed)),
+              bank.mintDecimals
+            ) * marketPrice,
+            USD_DECIMALS
+          )
         : BigInt(0),
     },
     baseAmountMarketPriceUsd: toBaseUnit(marketPrice, USD_DECIMALS),
@@ -243,18 +256,18 @@ export async function getMarginfiAccountPositionState(
   let supplyBank: Bank | null =
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
-        umi,
-        publicKey(MARGINFI_ACCOUNTS[supplyMint.toString()].bank),
-        { commitment: "confirmed" }
-      )
+          umi,
+          publicKey(MARGINFI_ACCOUNTS[supplyMint.toString()].bank),
+          { commitment: "confirmed" }
+        )
       : null;
   let debtBank: Bank | null =
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
-        umi,
-        publicKey(MARGINFI_ACCOUNTS[debtMint.toString()].bank),
-        { commitment: "confirmed" }
-      )
+          umi,
+          publicKey(MARGINFI_ACCOUNTS[debtMint.toString()].bank),
+          { commitment: "confirmed" }
+        )
       : null;
 
   let supplyUsage: PositionTokenUsage | undefined = undefined;
@@ -280,7 +293,9 @@ export async function getMarginfiAccountPositionState(
 
     if (supplyBalances.length > 0) {
       if (supplyBank === null) {
-        supplyBank = await safeFetchBank(umi, supplyBalances[0].bankPk, { commitment: "confirmed" });
+        supplyBank = await safeFetchBank(umi, supplyBalances[0].bankPk, {
+          commitment: "confirmed",
+        });
       }
       if (!supplyMint) {
         supplyMint = toWeb3JsPublicKey(supplyBank!.mint);
@@ -296,7 +311,9 @@ export async function getMarginfiAccountPositionState(
 
     if (debtBalances.length > 0) {
       if (debtBank === null) {
-        debtBank = await safeFetchBank(umi, debtBalances[0].bankPk, { commitment: "confirmed" });
+        debtBank = await safeFetchBank(umi, debtBalances[0].bankPk, {
+          commitment: "confirmed",
+        });
       }
       if (!debtMint) {
         debtMint = toWeb3JsPublicKey(debtBank!.mint);

package/src/utils/solanaUtils.ts

@@ -38,13 +38,14 @@ import {
 } from "../marginfi-sdk";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 
+export function buildHeliusApiUrl(heliusApiKey: string) {
+  return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
+}
+
 export function getSolanaRpcConnection(
-  heliusApiKey: string
+  rpcUrl: string
 ): [Connection, Umi] {
-  const connection = new Connection(
-    `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`,
-    "confirmed"
-  );
+  const connection = new Connection(rpcUrl, "confirmed");
   const umi = createUmi(connection);
   return [connection, umi];
 }
@@ -306,7 +307,7 @@ export async function sendSingleOptimizedTransaction(
         ),
       3
     );
-  
+
     const computeUnitLimit = Math.round(
       simulationResult.value.unitsConsumed! * 1.1
     );
@@ -328,7 +329,7 @@ export async function sendSingleOptimizedTransaction(
       confirm: { commitment: "confirmed" },
     });
     const txSig = bs58.encode(result.signature);
-    console.log(`Transaction signature: ${txSig}`)
+    console.log(`Transaction signature: ${txSig}`);
     console.log(`https://solscan.io/tx/${txSig}`);
     if (result.result.value.err !== null) {
       throw new Error(result.result.value.err.toString());

package/src/utils/solauto/generalUtils.ts

@@ -6,6 +6,7 @@ import {
   DCASettingsInpArgs,
   LendingPlatform,
   PositionState,
+  PositionType,
   SOLAUTO_PROGRAM_ID,
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
@@ -13,7 +14,6 @@ import {
   getReferralStateSize,
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
-  safeFetchAllSolautoPosition,
 } from "../../generated";
 import { currentUnixSeconds, fetchTokenPrices } from "../generalUtils";
 import {
@@ -174,12 +174,14 @@ export function eligibleForRefresh(
 
 export async function getSolautoManagedPositions(
   umi: Umi,
-  authority?: PublicKey
+  authority?: PublicKey,
+  positionTypeFilter?: PositionType
 ): Promise<SolautoPositionDetails[]> {
   // bump: [u8; 1]
   // position_id: [u8; 1]
   // self_managed: u8 - (1 for true, 0 for false)
-  // padding: [u8; 5]
+  // position_type: PositionType
+  // padding: [u8; 4]
   // authority: pubkey
   // lending_platform: u8
   // padding: [u8; 7]
@@ -191,7 +193,7 @@ export async function getSolautoManagedPositions(
     commitment: "confirmed",
     dataSlice: {
       offset: 0,
-      length: 1 + 1 + 1 + 5 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + padding (5) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
+      length: 1 + 1 + 1 + 1 + 4 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + position_type + padding (4) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
     },
     filters: [
       {
@@ -213,6 +215,14 @@ export async function getSolautoManagedPositions(
             },
           ]
         : []),
+      ...(positionTypeFilter !== undefined ? [
+        {
+          memcmp: {
+            bytes: new Uint8Array(positionTypeFilter),
+            offset: 3
+          }
+        }
+      ] : [])
     ],
   });
 
@@ -228,6 +238,7 @@ export async function getSolautoManagedPositions(
       authority: toWeb3JsPublicKey(position.authority),
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
+      positionType: position.positionType,
       protocolAccount: toWeb3JsPublicKey(position.position.protocolAccount),
       supplyMint: toWeb3JsPublicKey(position.position.supplyMint),
       debtMint: toWeb3JsPublicKey(position.position.debtMint),
@@ -286,14 +297,16 @@ export async function getReferralsByUser(
 
 export async function getAllPositionsByAuthority(
   umi: Umi,
-  user: PublicKey
+  user: PublicKey,
+  positionTypeFilter?: PositionType
 ): Promise<SolautoPositionDetails[]> {
   const solautoCompatiblePositions: SolautoPositionDetails[][] =
     await Promise.all([
       (async () => {
         const solautoManagedPositions = await getSolautoManagedPositions(
           umi,
-          user
+          user,
+          positionTypeFilter
         );
         return solautoManagedPositions.map((x) => ({
           ...x,
@@ -301,6 +314,10 @@ export async function getAllPositionsByAuthority(
         }));
       })(),
       (async () => {
+        if (positionTypeFilter === PositionType.SafeLoan) {
+          return [];
+        }
+
         let marginfiPositions = await getAllMarginfiAccountsByAuthority(
           umi,
           user,
@@ -316,6 +333,7 @@ export async function getAllPositionsByAuthority(
           publicKey: x.marginfiAccount,
           authority: user,
           positionId: 0,
+          positionType: PositionType.Leverage,
           lendingPlatform: LendingPlatform.Marginfi,
           protocolAccount: x.marginfiAccount,
           supplyMint: x.supplyMint,

package/tests/transactions/solautoMarginfi.ts

@@ -18,6 +18,7 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
+import { buildHeliusApiUrl } from "../../src/utils";
 
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
@@ -29,7 +30,7 @@ describe("Solauto Marginfi tests", async () => {
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
 
-    const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
+    const client = new SolautoMarginfiClient(buildHeliusApiUrl(process.env.HELIUS_API_KEY!), true);
 
     const supply = NATIVE_MINT;
     const supplyDecimals = 9;
@@ -39,7 +40,7 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
-        // authority: new PublicKey("")
+        authority: new PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm")
         // marginfiAccount: new PublicKey(
         //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
         // ),