@haven-fi/solauto-sdk 1.0.26 → 1.0.28

package/dist/clients/solautoMarginfiClient.d.ts

@@ -27,6 +27,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     initialize(args: SolautoMarginfiClientArgs): Promise<void>;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];
+    marginfiAccountInitialize(): TransactionBuilder;
     openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
     private marginfiOpenPositionIx;
     refresh(): TransactionBuilder;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAe3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAoEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAqDrC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA8CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAe3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAoEhD,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;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAsDrC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA8CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -80,6 +80,14 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.intermediaryMarginfiAccountPk,
         ];
     }
+    marginfiAccountInitialize() {
+        return (0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
+            marginfiAccount: this.marginfiAccount,
+            marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+            authority: this.signer,
+            feePayer: this.signer,
+        });
+    }
     openPosition(settingParams, dca) {
         return super
             .openPosition(settingParams, dca)
@@ -147,6 +155,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     marginfiProtocolInteractionIx(args) {
         switch (args.__kind) {
             case "Deposit": {
+                console.log(args.fields[0]);
                 return (0, marginfi_sdk_1.lendingAccountDeposit)(this.umi, {
                     amount: args.fields[0],
                     signer: this.signer,

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

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

package/dist/transactions/transactionUtils.js

@@ -13,6 +13,7 @@ const generalUtils_1 = require("../utils/generalUtils");
 const numberUtils_1 = require("../utils/numberUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
 const accountUtils_1 = require("../utils/accountUtils");
+const marginfi_sdk_1 = require("../marginfi-sdk");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
     const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
     const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
@@ -52,8 +53,15 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default))) {
         chores = chores.add(client.updateReferralStatesIx());
     }
-    if (client.selfManaged && client.solautoPositionData === undefined) {
-        chores = chores.add(client.openPosition());
+    if (client.selfManaged) {
+        if (client.solautoPositionData === undefined) {
+            chores = chores.add(client.openPosition());
+        }
+        else if (client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
+            !(await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
+            chores = chores.add(client.marginfiAccountInitialize());
+        }
+        // TODO: support other platforms
     }
     const wSolUsage = getWSolUsage(client, solautoActions, initiatingDcaIn, undefined);
     if (wSolUsage !== undefined) {
@@ -148,22 +156,111 @@ function transactionChoresAfter(client, solautoActions, cancellingDcaIn) {
 function getSolautoActions(tx) {
     let solautoActions = [];
     tx.getInstructions().forEach((x) => {
-        if (x.programId !== generated_1.SOLAUTO_PROGRAM_ID) {
-            return;
+        if (x.programId === generated_1.SOLAUTO_PROGRAM_ID) {
+            try {
+                const serializer = (0, generated_1.getMarginfiProtocolInteractionInstructionDataSerializer)();
+                const discriminator = serializer
+                    .serialize({
+                    solautoAction: (0, generated_1.solautoAction)("Deposit", [BigInt(0)]),
+                })
+                    .slice(0, 1)[0];
+                const [data, _] = serializer.deserialize(x.data);
+                if (data.discriminator === discriminator) {
+                    solautoActions?.push(data.solautoAction);
+                }
+            }
+            catch { }
         }
-        try {
-            const serializer = (0, generated_1.getMarginfiProtocolInteractionInstructionDataSerializer)();
-            const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
-                .serialize({
-                solautoAction: (0, generated_1.solautoAction)("Deposit", [BigInt(0)]),
-            })
-                .slice(0, 8));
-            const [data, _] = serializer.deserialize(x.data);
-            if (BigInt(data.discriminator) === discriminator) {
-                solautoActions?.push(data.solautoAction);
+        if (x.programId === marginfi_sdk_1.MARGINFI_PROGRAM_ID) {
+            try {
+                const serializer = (0, marginfi_sdk_1.getLendingAccountDepositInstructionDataSerializer)();
+                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                    .serialize({
+                    amount: 0,
+                })
+                    .slice(0, 8));
+                const [data, _] = serializer.deserialize(x.data);
+                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                    discriminator) {
+                    solautoActions?.push({
+                        __kind: "Deposit",
+                        fields: [data.amount],
+                    });
+                }
+            }
+            catch { }
+            try {
+                const serializer = (0, marginfi_sdk_1.getLendingAccountBorrowInstructionDataSerializer)();
+                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                    .serialize({
+                    amount: 0,
+                })
+                    .slice(0, 8));
+                const [data, _] = serializer.deserialize(x.data);
+                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                    discriminator) {
+                    solautoActions?.push({
+                        __kind: "Borrow",
+                        fields: [data.amount],
+                    });
+                }
+            }
+            catch { }
+            try {
+                const serializer = (0, marginfi_sdk_1.getLendingAccountWithdrawInstructionDataSerializer)();
+                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                    .serialize({
+                    amount: 0,
+                    withdrawAll: false,
+                })
+                    .slice(0, 8));
+                const [data, _] = serializer.deserialize(x.data);
+                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                    discriminator) {
+                    solautoActions?.push({
+                        __kind: "Withdraw",
+                        fields: [
+                            data.withdrawAll
+                                ? {
+                                    __kind: "All",
+                                }
+                                : {
+                                    __kind: "Some",
+                                    fields: [data.amount],
+                                },
+                        ],
+                    });
+                }
+            }
+            catch { }
+            try {
+                const serializer = (0, marginfi_sdk_1.getLendingAccountRepayInstructionDataSerializer)();
+                const discriminator = (0, numberUtils_1.uint8ArrayToBigInt)(serializer
+                    .serialize({
+                    amount: 0,
+                    repayAll: false,
+                })
+                    .slice(0, 8));
+                const [data, _] = serializer.deserialize(x.data);
+                if ((0, numberUtils_1.uint8ArrayToBigInt)(new Uint8Array(data.discriminator)) ===
+                    discriminator) {
+                    solautoActions?.push({
+                        __kind: "Repay",
+                        fields: [
+                            data.repayAll
+                                ? {
+                                    __kind: "All",
+                                }
+                                : {
+                                    __kind: "Some",
+                                    fields: [data.amount],
+                                },
+                        ],
+                    });
+                }
             }
+            catch { }
         }
-        catch { }
         // TODO support other platforms
     });
     return solautoActions;

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

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

package/dist/utils/jupiterUtils.js

@@ -30,6 +30,7 @@ async function getJupSwapTransaction(signer, swapDetails) {
             : swapDetails.exactIn
                 ? "ExactIn"
                 : undefined,
+        slippageBps: 10
     });
     const finalPriceSlippageBps = Math.round(Math.max(quoteResponse.slippageBps ?? 10, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct)))) *
         (1 + (swapDetails.slippageBpsIncFactor ?? 0)));

package/package.json

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

@@ -188,6 +188,15 @@ export class SolautoMarginfiClient extends SolautoClient {
     ];
   }
 
+  marginfiAccountInitialize(): TransactionBuilder {
+    return marginfiAccountInitialize(this.umi, {
+      marginfiAccount: this.marginfiAccount as Signer,
+      marginfiGroup: publicKey(this.marginfiGroup),
+      authority: this.signer,
+      feePayer: this.signer,
+    });
+  }
+
   openPosition(
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
@@ -267,6 +276,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   private marginfiProtocolInteractionIx(args: SolautoActionArgs) {
     switch (args.__kind) {
       case "Deposit": {
+        console.log(args.fields[0]);
         return lendingAccountDeposit(this.umi, {
           amount: args.fields[0],
           signer: this.signer,

package/src/transactions/transactionUtils.ts

@@ -40,11 +40,19 @@ import {
   rpcAccountCreated,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
-import { getMaxLiqUtilizationRate, uint8ArrayToBigInt } from "../utils/numberUtils";
 import {
-  eligibileForRebalance,
-} from "../utils/solauto/generalUtils";
+  getMaxLiqUtilizationRate,
+  uint8ArrayToBigInt,
+} from "../utils/numberUtils";
+import { eligibileForRebalance } from "../utils/solauto/generalUtils";
 import { getTokenAccount } from "../utils/accountUtils";
+import {
+  getLendingAccountBorrowInstructionDataSerializer,
+  getLendingAccountDepositInstructionDataSerializer,
+  getLendingAccountRepayInstructionDataSerializer,
+  getLendingAccountWithdrawInstructionDataSerializer,
+  MARGINFI_PROGRAM_ID,
+} from "../marginfi-sdk";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -109,8 +117,21 @@ async function transactionChoresBefore(
     chores = chores.add(client.updateReferralStatesIx());
   }
 
-  if (client.selfManaged && client.solautoPositionData === undefined) {
-    chores = chores.add(client.openPosition());
+  if (client.selfManaged) {
+    if (client.solautoPositionData === undefined) {
+      chores = chores.add(client.openPosition());
+    } else if (
+      client.lendingPlatform === LendingPlatform.Marginfi &&
+      !(await getSolanaAccountCreated(
+        client.umi,
+        (client as SolautoMarginfiClient).marginfiAccountPk
+      ))
+    ) {
+      chores = chores.add(
+        (client as SolautoMarginfiClient).marginfiAccountInitialize()
+      );
+    }
+    // TODO: support other platforms
   }
 
   const wSolUsage = getWSolUsage(
@@ -235,10 +256,7 @@ export async function rebalanceChoresBefore(
   let chores = transactionBuilder();
 
   if (checkReferralSupplyTa && !rpcAccountCreated(referredBySupplyTa)) {
-    client.log(
-      "Creating referred-by TA for ",
-      client.supplyMint.toString()
-    );
+    client.log("Creating referred-by TA for ", client.supplyMint.toString());
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
@@ -249,10 +267,7 @@ export async function rebalanceChoresBefore(
   }
 
   if (checkSolautoFeesTa && !rpcAccountCreated(solautoFeesSupplyTa)) {
-    client.log(
-      "Creating Solauto fees TA for ",
-      client.supplyMint.toString()
-    );
+    client.log("Creating Solauto fees TA for ", client.supplyMint.toString());
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
@@ -304,25 +319,127 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
   let solautoActions: SolautoAction[] = [];
 
   tx.getInstructions().forEach((x) => {
-    if (x.programId !== SOLAUTO_PROGRAM_ID) {
-      return;
-    }
-
-    try {
-      const serializer =
-        getMarginfiProtocolInteractionInstructionDataSerializer();
-      const discriminator = uint8ArrayToBigInt(
-        serializer
+    if (x.programId === SOLAUTO_PROGRAM_ID) {
+      try {
+        const serializer =
+          getMarginfiProtocolInteractionInstructionDataSerializer();
+        const discriminator = serializer
           .serialize({
             solautoAction: solautoAction("Deposit", [BigInt(0)]),
           })
-          .slice(0, 8)
-      );
-      const [data, _] = serializer.deserialize(x.data);
-      if (BigInt(data.discriminator) === discriminator) {
-        solautoActions?.push(data.solautoAction);
-      }
-    } catch {}
+          .slice(0, 1)[0];
+        const [data, _] = serializer.deserialize(x.data);
+        if (data.discriminator === discriminator) {
+          solautoActions?.push(data.solautoAction);
+        }
+      } catch {}
+    }
+
+    if (x.programId === MARGINFI_PROGRAM_ID) {
+      try {
+        const serializer = getLendingAccountDepositInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Deposit",
+            fields: [data.amount],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountBorrowInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Borrow",
+            fields: [data.amount],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountWithdrawInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+              withdrawAll: false,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Withdraw",
+            fields: [
+              data.withdrawAll
+                ? {
+                    __kind: "All",
+                  }
+                : {
+                    __kind: "Some",
+                    fields: [data.amount],
+                  },
+            ],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountRepayInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+              repayAll: false,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Repay",
+            fields: [
+              data.repayAll
+                ? {
+                    __kind: "All",
+                  }
+                : {
+                    __kind: "Some",
+                    fields: [data.amount],
+                  },
+            ],
+          });
+        }
+      } catch {}
+    }
 
     // TODO support other platforms
   });
@@ -483,7 +600,7 @@ export async function buildSolautoRebalanceTransaction(
 export async function convertReferralFeesToDestination(
   umi: Umi,
   referralState: ReferralState,
-  tokenAccount: SplTokenAccount,
+  tokenAccount: SplTokenAccount
 ): Promise<[TransactionBuilder, string[]]> {
   const { lookupTableAddresses, setupInstructions, swapIx } =
     await getJupSwapTransaction(umi.identity, {

package/src/utils/jupiterUtils.ts

@@ -62,6 +62,7 @@ export async function getJupSwapTransaction(
       : swapDetails.exactIn
         ? "ExactIn"
         : undefined,
+    slippageBps: 10
   });
 
   const finalPriceSlippageBps = Math.round(

package/tests/transactions/solautoMarginfi.ts

@@ -45,9 +45,11 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
-        marginfiAccount: new PublicKey("4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"),
+        marginfiAccount: new PublicKey(
+          "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+        ),
         supplyMint: NATIVE_MINT,
-        debtMint: new PublicKey(USDC_MINT)
+        debtMint: new PublicKey(USDC_MINT),
       }
     );
 
@@ -104,6 +106,20 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
+    // const initialSupplyUsd = 50;
+    // transactionItems.push(
+    //   new TransactionItem(async () => {
+    //     const [supplyPrice] = await getTokenPrices([supply]);
+    //     return {
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Deposit", [
+    //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+    //         ])
+    //       ),
+    //     };
+    //   }, "deposit")
+    // );
+
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>