@haven-fi/solauto-sdk 1.0.34 → 1.0.35

package/dist/clients/solautoMarginfiClient.js

@@ -110,9 +110,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 : undefined,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
-            marginfiAccount: this.marginfiAccountSeedIdx !== undefined
-                ? (0, umi_1.publicKey)(this.marginfiAccount)
-                : this.marginfiAccount,
+            marginfiAccount: "publicKey" in this.marginfiAccount
+                ? this.marginfiAccount
+                : (0, umi_1.publicKey)(this.marginfiAccount),
             supplyMint: (0, umi_1.publicKey)(this.supplyMint),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
@@ -125,7 +125,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 settingParams: settingParams ?? null,
                 dca: dca ?? null,
             },
-            marginfiAccountSeedIdx: this.marginfiAccountSeedIdx ?? null,
+            marginfiAccountSeedIdx: !this.selfManaged ? this.marginfiAccountSeedIdx : null,
         });
     }
     refresh() {

package/package.json

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

@@ -215,9 +215,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       solautoPosition: publicKey(this.solautoPosition),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount:
-        this.marginfiAccountSeedIdx !== undefined
-          ? publicKey(this.marginfiAccount)
-          : (this.marginfiAccount as Signer),
+        "publicKey" in this.marginfiAccount
+          ? this.marginfiAccount as Signer
+          : publicKey(this.marginfiAccount),
       supplyMint: publicKey(this.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       positionSupplyTa: publicKey(this.positionSupplyTa),
@@ -230,7 +230,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         settingParams: settingParams ?? null,
         dca: dca ?? null,
       },
-      marginfiAccountSeedIdx: this.marginfiAccountSeedIdx ?? null,
+      marginfiAccountSeedIdx: !this.selfManaged ? this.marginfiAccountSeedIdx : null,
     });
   }