@haven-fi/solauto-sdk 1.0.830 → 1.0.832

package/dist/services/flashLoans/marginfiFlProvider.d.ts

@@ -11,6 +11,8 @@ export declare class MarginfiFlProvider extends FlProviderBase {
     private debtImfiAccount;
     private supplyRemainingAccounts;
     private debtRemainingAccounts;
+    private supplyBankHealthAccounts;
+    private debtBankHealthAccounts;
     initialize(): Promise<void>;
     private setAvailableBanks;
     private setIntermediaryAccount;
@@ -19,6 +21,7 @@ export declare class MarginfiFlProvider extends FlProviderBase {
     liquiditySource(source: TokenType): PublicKey;
     private liquidityBank;
     private iMfiAccount;
+    private bankHealthAccounts;
     liquidityAvailable(source: TokenType): bigint;
     flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
     flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;

package/dist/services/flashLoans/marginfiFlProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAkBlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAChD,OAAO,CAAC,qBAAqB,CAAiB;IAExC,UAAU;YAiBF,iBAAiB;YA6CjB,sBAAsB;IAsD9B,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAI7C,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAiD3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
+{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAmBlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IACtC,OAAO,CAAC,uBAAuB,CAAiB;IAChD,OAAO,CAAC,qBAAqB,CAAiB;IAC9C,OAAO,CAAC,wBAAwB,CAAiB;IACjD,OAAO,CAAC,sBAAsB,CAAiB;IAEzC,UAAU;YAiBF,iBAAiB;YAgEjB,sBAAsB;IAsD9B,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAI7C,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,kBAAkB;IAM1B,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAsDrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAiD3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -51,6 +51,22 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         const debtBanks = mapBanksAndBalances(this.debtMint);
         this.supplyBankLiquiditySource = supplyBanks[0][1];
         this.debtBankLiquiditySource = debtBanks[0][1];
+        const [supplyPriceOracle, debtPriceOracle] = await Promise.all([
+            (0, utils_1.getMarginfiPriceOracle)(this.umi, {
+                data: this.supplyBankLiquiditySource,
+            }),
+            (0, utils_1.getMarginfiPriceOracle)(this.umi, {
+                data: this.debtBankLiquiditySource,
+            }),
+        ]);
+        this.supplyBankHealthAccounts = [
+            (0, utils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.supplyBankLiquiditySource.publicKey)),
+            (0, utils_1.getAccountMeta)(supplyPriceOracle),
+        ];
+        this.debtBankHealthAccounts = [
+            (0, utils_1.getAccountMeta)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.debtBankLiquiditySource.publicKey)),
+            (0, utils_1.getAccountMeta)(debtPriceOracle),
+        ];
     }
     async setIntermediaryAccount(sources) {
         const compatibleMarginfiAccounts = this.existingMarginfiAccounts.filter((x) => x.group.toString() == this.liquidityBank(sources[0]).group);
@@ -137,6 +153,11 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             ? this.supplyImfiAccount
             : this.debtImfiAccount;
     }
+    bankHealthAccounts(source) {
+        return source === generated_1.TokenType.Supply
+            ? this.supplyBankHealthAccounts
+            : this.debtBankHealthAccounts;
+    }
     liquidityAvailable(source) {
         return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.liquidityBank(source), false);
     }
@@ -154,6 +175,15 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         const bank = this.liquidityBank(flashLoan.liquiditySource);
         const associatedBankAccs = (0, utils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.publicKey));
         const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource);
+        const existingRemainingAccounts = flashLoan.liquiditySource === generated_1.TokenType.Supply
+            ? this.supplyRemainingAccounts
+            : this.debtRemainingAccounts;
+        // Marginfi's circuit-breaker gate scans every active bank during borrow,
+        // including borrows made while the account is inside a flash loan.
+        const borrowRemainingAccounts = [...existingRemainingAccounts];
+        if (!borrowRemainingAccounts.some((account) => account.pubkey.toString() === bank.publicKey.toString())) {
+            borrowRemainingAccounts.push(...this.bankHealthAccounts(flashLoan.liquiditySource));
+        }
         return (0, umi_1.transactionBuilder)()
             .add((0, marginfi_1.lendingAccountStartFlashloan)(this.umi, {
             endIndex: 0, // We set this after building the transaction
@@ -170,7 +200,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             marginfiGroup: this.liquidityBank(flashLoan.liquiditySource).group,
             signer: this.signer,
-        }));
+        }).addRemainingAccounts((0, utils_1.composeRemainingAccounts)(borrowRemainingAccounts)));
     }
     flashRepay(flashLoan) {
         if (flashLoan.signerFlashLoan) {

package/dist/utils/marginfi/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA8BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAiBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAW3E"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA8BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAiBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAoB3E"}

package/dist/utils/marginfi/general.js

@@ -141,6 +141,15 @@ function marginfiAccountEmpty(marginfiAccount) {
 function composeRemainingAccounts(accs) {
     const banksAndOracles = accs.reduce((acc, _, i) => i % 2 === 0 ? [...acc, [accs[i], accs[i + 1]]] : acc, []);
     return banksAndOracles
-        .sort((a, b) => b[0].pubkey.toString().localeCompare(a[0].pubkey.toString()))
+        .sort((a, b) => {
+        const aBytes = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(a[0].pubkey).toBuffer();
+        const bBytes = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(b[0].pubkey).toBuffer();
+        for (let i = 0; i < aBytes.length; i++) {
+            if (aBytes[i] !== bBytes[i]) {
+                return bBytes[i] - aBytes[i];
+            }
+        }
+        return 0;
+    })
         .flat();
 }

package/package.json

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

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -30,6 +30,7 @@ import {
   fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getEmptyMarginfiAccountsByAuthority,
+  getAccountMeta,
   getMarginfiPriceOracle,
   getRemainingAccountsForMarginfiHealthCheck,
   getTokenAccount,
@@ -56,6 +57,8 @@ export class MarginfiFlProvider extends FlProviderBase {
   private debtImfiAccount!: IMFIAccount;
   private supplyRemainingAccounts!: AccountMeta[];
   private debtRemainingAccounts!: AccountMeta[];
+  private supplyBankHealthAccounts!: AccountMeta[];
+  private debtBankHealthAccounts!: AccountMeta[];
 
   async initialize() {
     await this.setAvailableBanks();
@@ -117,6 +120,25 @@ export class MarginfiFlProvider extends FlProviderBase {
 
     this.supplyBankLiquiditySource = supplyBanks[0][1];
     this.debtBankLiquiditySource = debtBanks[0][1];
+
+    const [supplyPriceOracle, debtPriceOracle] = await Promise.all([
+      getMarginfiPriceOracle(this.umi, {
+        data: this.supplyBankLiquiditySource,
+      }),
+      getMarginfiPriceOracle(this.umi, {
+        data: this.debtBankLiquiditySource,
+      }),
+    ]);
+    this.supplyBankHealthAccounts = [
+      getAccountMeta(
+        toWeb3JsPublicKey(this.supplyBankLiquiditySource.publicKey)
+      ),
+      getAccountMeta(supplyPriceOracle),
+    ];
+    this.debtBankHealthAccounts = [
+      getAccountMeta(toWeb3JsPublicKey(this.debtBankLiquiditySource.publicKey)),
+      getAccountMeta(debtPriceOracle),
+    ];
   }
 
   private async setIntermediaryAccount(sources: TokenType[]) {
@@ -242,6 +264,12 @@ export class MarginfiFlProvider extends FlProviderBase {
       : this.debtImfiAccount;
   }
 
+  private bankHealthAccounts(source: TokenType): AccountMeta[] {
+    return source === TokenType.Supply
+      ? this.supplyBankHealthAccounts
+      : this.debtBankHealthAccounts;
+  }
+
   liquidityAvailable(source: TokenType): bigint {
     return getBankLiquidityAvailableBaseUnit(this.liquidityBank(source), false);
   }
@@ -273,6 +301,22 @@ export class MarginfiFlProvider extends FlProviderBase {
       toWeb3JsPublicKey(bank.publicKey)
     );
     const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource)!;
+    const existingRemainingAccounts =
+      flashLoan.liquiditySource === TokenType.Supply
+        ? this.supplyRemainingAccounts
+        : this.debtRemainingAccounts;
+    // Marginfi's circuit-breaker gate scans every active bank during borrow,
+    // including borrows made while the account is inside a flash loan.
+    const borrowRemainingAccounts = [...existingRemainingAccounts];
+    if (
+      !borrowRemainingAccounts.some(
+        (account) => account.pubkey.toString() === bank.publicKey.toString()
+      )
+    ) {
+      borrowRemainingAccounts.push(
+        ...this.bankHealthAccounts(flashLoan.liquiditySource)
+      );
+    }
 
     return transactionBuilder()
       .add(
@@ -295,7 +339,9 @@ export class MarginfiFlProvider extends FlProviderBase {
           marginfiAccount: publicKey(iMfiAccount.accountPk),
           marginfiGroup: this.liquidityBank(flashLoan.liquiditySource).group,
           signer: this.signer,
-        })
+        }).addRemainingAccounts(
+          composeRemainingAccounts(borrowRemainingAccounts)
+        )
       );
   }
 

package/src/utils/marginfi/general.ts

@@ -227,8 +227,17 @@ export function composeRemainingAccounts(accs: AccountMeta[]): AccountMeta[] {
     []
   );
   return banksAndOracles
-    .sort((a, b) =>
-      b[0].pubkey.toString().localeCompare(a[0].pubkey.toString())
-    )
+    .sort((a, b) => {
+      const aBytes = toWeb3JsPublicKey(a[0].pubkey).toBuffer();
+      const bBytes = toWeb3JsPublicKey(b[0].pubkey).toBuffer();
+
+      for (let i = 0; i < aBytes.length; i++) {
+        if (aBytes[i] !== bBytes[i]) {
+          return bBytes[i] - aBytes[i];
+        }
+      }
+
+      return 0;
+    })
     .flat();
 }

package/tests/unit/marginfiRemainingAccounts.ts

@@ -0,0 +1,45 @@
+import { assert } from "chai";
+import { describe, it } from "mocha";
+import { AccountMeta, publicKey } from "@metaplex-foundation/umi";
+import { composeRemainingAccounts } from "../../src";
+
+function readonlyMeta(address: string): AccountMeta {
+  return {
+    pubkey: publicKey(address),
+    isSigner: false,
+    isWritable: false,
+  };
+}
+
+describe("Marginfi remaining accounts", () => {
+  it("sorts bank groups by descending public-key bytes", () => {
+    // Base58 locale ordering puts DMoq before DeyH, but Marginfi's Rust
+    // comparator orders their decoded public-key bytes in the opposite order.
+    const deYhBank = readonlyMeta(
+      "DeyH7QxWvnbbaVB4zFrf4hoq7Q8z1ZT14co42BGwGtfM"
+    );
+    const deYhOracle = readonlyMeta(
+      "SysvarC1ock11111111111111111111111111111111"
+    );
+    const dMoqBank = readonlyMeta(
+      "DMoqjmsuoru986HgfjqrKEvPv8YBufvBGADHUonkadC5"
+    );
+    const dMoqOracle = readonlyMeta(
+      "SysvarRent111111111111111111111111111111111"
+    );
+
+    const result = composeRemainingAccounts([
+      dMoqBank,
+      dMoqOracle,
+      deYhBank,
+      deYhOracle,
+    ]);
+
+    assert.deepEqual(
+      result.map((account) => account.pubkey.toString()),
+      [deYhBank, deYhOracle, dMoqBank, dMoqOracle].map((account) =>
+        account.pubkey.toString()
+      )
+    );
+  });
+});