@haven-fi/solauto-sdk 1.0.31 → 1.0.32

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,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"}
+{"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;IAkEhD,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;IAoErC,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;IAgDrB,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

@@ -31,9 +31,6 @@ function newSolautoMarginfiPositionArgs(positionId, signer, wallet, supplyMint,
 exports.newSolautoMarginfiPositionArgs = newSolautoMarginfiPositionArgs;
 class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     async initialize(args) {
-        if (args.marginfiAccount) {
-            this.marginfiAccount = args.marginfiAccount;
-        }
         await super.initialize(args, generated_1.LendingPlatform.Marginfi);
         this.marginfiAccountSeedIdx = args.marginfiAccountSeedIdx;
         this.marginfiAccount =
@@ -55,7 +52,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiDebtBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
             mint: this.debtMint.toString(),
         });
-        const existingMarginfiAccounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false);
+        const existingMarginfiAccounts = (await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false)).filter((x) => x.marginfiAccount.equals(this.marginfiAccountPk));
         const emptyMarginfiAccounts = (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, existingMarginfiAccounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
             (Math.round((0, numberUtils_1.bytesToI80F48)(y.assetShares.value)) != 0 ||
                 Math.round((0, numberUtils_1.bytesToI80F48)(y.liabilityShares.value)) != 0)) === undefined);
@@ -270,7 +267,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            signerSupplyTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerSupplyTa) : undefined,
+            signerSupplyTa: this.selfManaged
+                ? (0, umi_1.publicKey)(this.signerSupplyTa)
+                : undefined,
             vaultSupplyTa: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
             supplyVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),

package/package.json

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

@@ -109,10 +109,6 @@ export class SolautoMarginfiClient extends SolautoClient {
   public intermediaryMarginfiAccount?: MarginfiAccount;
 
   async initialize(args: SolautoMarginfiClientArgs) {
-    if (args.marginfiAccount) {
-      this.marginfiAccount = args.marginfiAccount;
-    }
-
     await super.initialize(args, LendingPlatform.Marginfi);
 
     this.marginfiAccountSeedIdx = args.marginfiAccountSeedIdx;
@@ -144,11 +140,13 @@ export class SolautoMarginfiClient extends SolautoClient {
       mint: this.debtMint.toString(),
     })!;
 
-    const existingMarginfiAccounts = await getAllMarginfiAccountsByAuthority(
-      this.umi,
-      toWeb3JsPublicKey(this.signer.publicKey),
-      false
-    );
+    const existingMarginfiAccounts = (
+      await getAllMarginfiAccountsByAuthority(
+        this.umi,
+        toWeb3JsPublicKey(this.signer.publicKey),
+        false
+      )
+    ).filter((x) => x.marginfiAccount.equals(this.marginfiAccountPk));
     const emptyMarginfiAccounts = (
       await safeFetchAllMarginfiAccount(
         this.umi,
@@ -284,7 +282,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiSupplyBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
+          bankLiquidityVault: publicKey(
+            this.marginfiSupplyBankAccounts.liquidityVault
+          ),
         });
       }
       case "Borrow": {
@@ -295,33 +295,45 @@ export class SolautoMarginfiClient extends SolautoClient {
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiDebtBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
-          bankLiquidityVaultAuthority: publicKey(this.marginfiDebtBankAccounts.vaultAuthority),
+          bankLiquidityVault: publicKey(
+            this.marginfiDebtBankAccounts.liquidityVault
+          ),
+          bankLiquidityVaultAuthority: publicKey(
+            this.marginfiDebtBankAccounts.vaultAuthority
+          ),
         });
       }
       case "Repay": {
         return lendingAccountRepay(this.umi, {
-          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          amount:
+            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
           repayAll: args.fields[0].__kind === "All" ? true : false,
           signer: this.signer,
           signerTokenAccount: publicKey(this.signerDebtTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiDebtBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
+          bankLiquidityVault: publicKey(
+            this.marginfiDebtBankAccounts.liquidityVault
+          ),
         });
       }
       case "Withdraw": {
         return lendingAccountWithdraw(this.umi, {
-          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          amount:
+            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
           withdrawAll: args.fields[0].__kind === "All" ? true : false,
           signer: this.signer,
           destinationTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiSupplyBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
-          bankLiquidityVaultAuthority: publicKey(this.marginfiSupplyBankAccounts.vaultAuthority),
+          bankLiquidityVault: publicKey(
+            this.marginfiSupplyBankAccounts.liquidityVault
+          ),
+          bankLiquidityVaultAuthority: publicKey(
+            this.marginfiSupplyBankAccounts.vaultAuthority
+          ),
         });
       }
     }
@@ -422,7 +434,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
-      signerSupplyTa: this.selfManaged ? publicKey(this.signerSupplyTa) : undefined,
+      signerSupplyTa: this.selfManaged
+        ? publicKey(this.signerSupplyTa)
+        : undefined,
       vaultSupplyTa: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
       supplyVaultAuthority: publicKey(
         this.marginfiSupplyBankAccounts.vaultAuthority

package/tests/unit/rebalanceCalculations.ts

@@ -261,7 +261,6 @@ describe("Rebalance tests", async () => {
   let supplyPrice: number, debtPrice: number;
 
   before(async () => {
-    console.log("Fetching prices for test");
     [supplyPrice, debtPrice] = await getTokenPrices([
       NATIVE_MINT,
       new PublicKey(USDC_MINT),