hedge-web3 0.2.1 → 0.2.7

package/declarations/idl/vault.d.ts

@@ -1706,6 +1706,54 @@ export declare type Vault = {
                 }
             ];
             "args": [];
+        },
+        {
+            "name": "closeClaimedLiquidationPoolPosition";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "poolPosition";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [];
+        },
+        {
+            "name": "closeClaimedStakingPoolPosition";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "poolPosition";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [];
+        },
+        {
+            "name": "closeUnusedPoolEra";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "poolEra";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [];
         }
     ];
     "accounts": [
@@ -2803,26 +2851,36 @@ export declare type Vault = {
         },
         {
             "code": 6025;
+            "name": "PositionNotClaimed";
+            "msg": "Not all positions claimed. Claim all before closing account to recover SOL rent.";
+        },
+        {
+            "code": 6026;
+            "name": "PoolWasUsed";
+            "msg": "Era was not unused. Cannot reclaim the SOL rent.";
+        },
+        {
+            "code": 6027;
             "name": "UpdateVaultTypeBadMaxDebtExtended";
             "msg": "New Max debt extended value is less than the current debt!";
         },
         {
-            "code": 6026;
+            "code": 6028;
             "name": "UpdateVaultTypeNoEnabledOracles";
             "msg": "No Enabled Oracles!";
         },
         {
-            "code": 6027;
+            "code": 6029;
             "name": "UpdateVaultTypeDuplicateOraclePriorities";
             "msg": "Duplicate Oracle Priorities";
         },
         {
-            "code": 6028;
+            "code": 6030;
             "name": "UpdateVaultTypeInvalidOraclePriority";
             "msg": "Invalid Oracle Priority";
         },
         {
-            "code": 6029;
+            "code": 6031;
             "name": "OracleUpdateFailed";
             "msg": "OracleUpdateFailed";
         }

package/declarations/index.d.ts

@@ -5,6 +5,7 @@ export * from './instructions/claimStakingPoolPosition';
 export * from './instructions/depositLiquidationPool';
 export * from './instructions/closeLiquidationPoolPosition';
 export * from './instructions/claimLiquidationPoolPosition';
+export * from './instructions/closeClaimedLiquidationPoolPosition';
 export * from './instructions/createVault';
 export * from './instructions/depositVault';
 export * from './instructions/withdrawVault';

package/declarations/instructions/closeClaimedLiquidationPoolPosition.d.ts

@@ -0,0 +1,5 @@
+import { Program, Provider } from '@project-serum/anchor';
+import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
+import { Vault } from '../idl/vault';
+export declare function closeClaimedLiquidationPoolPosition(program: Program<Vault>, provider: Provider, poolPosition: PublicKey, payer: Signer): Promise<PublicKey>;
+export declare function closeClaimedLiquidationPoolPositionInstruction(program: Program<Vault>, poolPosition: PublicKey, payer: PublicKey): Promise<TransactionInstruction>;

package/declarations/instructions/setVaultTypeStatus.d.ts

@@ -1,5 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
-import { Vault } from 'idl/vault';
-export declare function setVaultTypeStatus(program: Program<Vault>, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<PublicKey>;
-export declare function setVaultTypeStatusInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<TransactionInstruction>;
+export declare function setVaultTypeStatus(program: Program, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<PublicKey>;
+export declare function setVaultTypeStatusInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<TransactionInstruction>;

package/lib/idl/vault.js

@@ -1709,6 +1709,54 @@ exports.IDL = {
                 }
             ],
             "args": []
+        },
+        {
+            "name": "closeClaimedLiquidationPoolPosition",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "poolPosition",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
+        {
+            "name": "closeClaimedStakingPoolPosition",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "poolPosition",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
+        {
+            "name": "closeUnusedPoolEra",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "poolEra",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
         }
     ],
     "accounts": [
@@ -2806,26 +2854,36 @@ exports.IDL = {
         },
         {
             "code": 6025,
+            "name": "PositionNotClaimed",
+            "msg": "Not all positions claimed. Claim all before closing account to recover SOL rent."
+        },
+        {
+            "code": 6026,
+            "name": "PoolWasUsed",
+            "msg": "Era was not unused. Cannot reclaim the SOL rent."
+        },
+        {
+            "code": 6027,
             "name": "UpdateVaultTypeBadMaxDebtExtended",
             "msg": "New Max debt extended value is less than the current debt!"
         },
         {
-            "code": 6026,
+            "code": 6028,
             "name": "UpdateVaultTypeNoEnabledOracles",
             "msg": "No Enabled Oracles!"
         },
         {
-            "code": 6027,
+            "code": 6029,
             "name": "UpdateVaultTypeDuplicateOraclePriorities",
             "msg": "Duplicate Oracle Priorities"
         },
         {
-            "code": 6028,
+            "code": 6030,
             "name": "UpdateVaultTypeInvalidOraclePriority",
             "msg": "Invalid Oracle Priority"
         },
         {
-            "code": 6029,
+            "code": 6031,
             "name": "OracleUpdateFailed",
             "msg": "OracleUpdateFailed"
         }

package/lib/index.js

@@ -17,6 +17,7 @@ __exportStar(require("./instructions/claimStakingPoolPosition"), exports);
 __exportStar(require("./instructions/depositLiquidationPool"), exports);
 __exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/claimLiquidationPoolPosition"), exports);
+__exportStar(require("./instructions/closeClaimedLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/createVault"), exports);
 __exportStar(require("./instructions/depositVault"), exports);
 __exportStar(require("./instructions/withdrawVault"), exports);

package/lib/instructions/closeClaimedLiquidationPoolPosition.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.closeClaimedLiquidationPoolPositionInstruction = exports.closeClaimedLiquidationPoolPosition = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Errors_1 = require("../utils/Errors");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+function closeClaimedLiquidationPoolPosition(program, provider, poolPosition, payer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const transaction = new web3_js_1.Transaction().add(yield closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer.publicKey));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        return poolPosition;
+    });
+}
+exports.closeClaimedLiquidationPoolPosition = closeClaimedLiquidationPoolPosition;
+function closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return program.methods
+            .closeClaimedLiquidationPoolPosition()
+            .accounts({
+            poolPosition: poolPosition,
+            payer: payer
+        })
+            .instruction();
+    });
+}
+exports.closeClaimedLiquidationPoolPositionInstruction = closeClaimedLiquidationPoolPositionInstruction;

package/lib/instructions/setVaultTypeStatus.js

@@ -17,21 +17,22 @@ function setVaultTypeStatus(program, provider, payer, vaultTypeAccount, deprecat
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const transaction = new web3_js_1.Transaction().add(yield setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, deprecated));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider === null || provider === void 0 ? void 0 : provider.opts).catch(Errors_1.parseAnchorErrors);
         return vaultSystemStatePublicKey;
     });
 }
 exports.setVaultTypeStatus = setVaultTypeStatus;
 function setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, deprecated) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield program.methods
-            .setVaultTypeStatus(deprecated)
-            .accounts({
-            payer: payerPublicKey,
-            vaultSystemState: vaultSystemStatePublicKey,
-            vaultType: vaultTypeAccount,
-        })
-            .instruction();
+        const ix = program.instruction.setVaultTypeStatus(deprecated, {
+            accounts: {
+                payer: payerPublicKey,
+                vaultSystemState: vaultSystemStatePublicKey,
+                vaultType: vaultTypeAccount,
+            },
+            signers: []
+        });
+        return ix;
     });
 }
 exports.setVaultTypeStatusInstruction = setVaultTypeStatusInstruction;

package/lib/state/VaultAccount.js

@@ -32,7 +32,9 @@ const borsh = __importStar(require("@project-serum/borsh"));
  */
 class VaultAccount {
     constructor(vault, publicKey) {
-        var _a, _b, _c;
+        var _a, _b;
+        /** The ordered number of when this vault was created. */
+        this.vaultNumber = 0;
         /** Debt redistribution snapshot */
         this.debtProductSnapshotBytes = new decimal_js_1.default(0);
         /** Collateral redistribution snapshot' */
@@ -41,10 +43,12 @@ class VaultAccount {
         this.vaultStatus = '';
         this.publicKey = publicKey;
         this.vaultOwner = vault.vaultOwner;
-        this.vaultNumber = (_a = vault.vaultNumber) === null || _a === void 0 ? void 0 : _a.toNumber();
         this.pdaSalt = vault.pdaSalt;
-        this.deposited = (_b = vault.deposited) === null || _b === void 0 ? void 0 : _b.toNumber();
-        this.denormalizedDebt = (_c = vault.denormalizedDebt) === null || _c === void 0 ? void 0 : _c.toNumber();
+        this.deposited = (_a = vault.deposited) === null || _a === void 0 ? void 0 : _a.toNumber();
+        this.denormalizedDebt = (_b = vault.denormalizedDebt) === null || _b === void 0 ? void 0 : _b.toNumber();
+        if (vault.vaultNumber) {
+            this.vaultNumber = vault.vaultNumber.toNumber();
+        }
         if (vault.debtProductSnapshotBytes) {
             this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
         }
@@ -138,7 +142,7 @@ class VaultAccount {
         if (this.nextVaultToRedeem) {
             nextVault = this.nextVaultToRedeem.toString().substring(0, 6);
         }
-        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
+        return `${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
     }
     /**
      * Creates a VaultAccount from a slice of data
@@ -153,7 +157,7 @@ class VaultAccount {
      * @returns a new VaultAccount
      */
     static FromMiniSlice(data, pubkey) {
-        const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
+        const props = [borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
         const miniVaultLayout = borsh.struct(props, 'minVaultLayout');
         const decodedData = miniVaultLayout.decode(data);
         return new VaultAccount(decodedData, pubkey);

package/lib/utils/getLinkedListAccounts.js

@@ -157,7 +157,7 @@ function sortVaults(a, b) {
     const aRatio = a.deposited / a.denormalizedDebt;
     const bRatio = b.deposited / b.denormalizedDebt;
     if (aRatio === bRatio) {
-        return b.vaultNumber - a.vaultNumber;
+        return a.publicKey.toString() > b.publicKey.toString() ? 1 : -1;
     }
     return aRatio - bRatio;
 }
@@ -189,8 +189,8 @@ function getMiniVaults(program, vaultTypePublicKey) {
             // Slice the data only to grab the 3 u64's of size 8 bytes each
             dataSlice: {
                 // See programs/hedge-vault/src/account_data/vault.rs for struct layout
-                offset: 8 + 32,
-                length: 24,
+                offset: 8 + 32 + 8,
+                length: 16,
             },
         });
         return allAccounts.map((vaultData) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.1",
+  "version": "0.2.7",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/idl/vault.ts

@@ -1706,6 +1706,54 @@ export type Vault = {
         }
       ],
       "args": []
+    },
+    {
+      "name": "closeClaimedLiquidationPoolPosition",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolPosition",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "closeClaimedStakingPoolPosition",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolPosition",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "closeUnusedPoolEra",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolEra",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
     }
   ],
   "accounts": [
@@ -2803,26 +2851,36 @@ export type Vault = {
     },
     {
       "code": 6025,
+      "name": "PositionNotClaimed",
+      "msg": "Not all positions claimed. Claim all before closing account to recover SOL rent."
+    },
+    {
+      "code": 6026,
+      "name": "PoolWasUsed",
+      "msg": "Era was not unused. Cannot reclaim the SOL rent."
+    },
+    {
+      "code": 6027,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     },
     {
-      "code": 6026,
+      "code": 6028,
       "name": "UpdateVaultTypeNoEnabledOracles",
       "msg": "No Enabled Oracles!"
     },
     {
-      "code": 6027,
+      "code": 6029,
       "name": "UpdateVaultTypeDuplicateOraclePriorities",
       "msg": "Duplicate Oracle Priorities"
     },
     {
-      "code": 6028,
+      "code": 6030,
       "name": "UpdateVaultTypeInvalidOraclePriority",
       "msg": "Invalid Oracle Priority"
     },
     {
-      "code": 6029,
+      "code": 6031,
       "name": "OracleUpdateFailed",
       "msg": "OracleUpdateFailed"
     }
@@ -4537,6 +4595,54 @@ export const IDL: Vault = {
         }
       ],
       "args": []
+    },
+    {
+      "name": "closeClaimedLiquidationPoolPosition",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolPosition",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "closeClaimedStakingPoolPosition",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolPosition",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "closeUnusedPoolEra",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "poolEra",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
     }
   ],
   "accounts": [
@@ -5634,26 +5740,36 @@ export const IDL: Vault = {
     },
     {
       "code": 6025,
+      "name": "PositionNotClaimed",
+      "msg": "Not all positions claimed. Claim all before closing account to recover SOL rent."
+    },
+    {
+      "code": 6026,
+      "name": "PoolWasUsed",
+      "msg": "Era was not unused. Cannot reclaim the SOL rent."
+    },
+    {
+      "code": 6027,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     },
     {
-      "code": 6026,
+      "code": 6028,
       "name": "UpdateVaultTypeNoEnabledOracles",
       "msg": "No Enabled Oracles!"
     },
     {
-      "code": 6027,
+      "code": 6029,
       "name": "UpdateVaultTypeDuplicateOraclePriorities",
       "msg": "Duplicate Oracle Priorities"
     },
     {
-      "code": 6028,
+      "code": 6030,
       "name": "UpdateVaultTypeInvalidOraclePriority",
       "msg": "Invalid Oracle Priority"
     },
     {
-      "code": 6029,
+      "code": 6031,
       "name": "OracleUpdateFailed",
       "msg": "OracleUpdateFailed"
     }

package/src/index.ts

@@ -6,6 +6,7 @@ export * from './instructions/claimStakingPoolPosition'
 export * from './instructions/depositLiquidationPool'
 export * from './instructions/closeLiquidationPoolPosition'
 export * from './instructions/claimLiquidationPoolPosition'
+export * from './instructions/closeClaimedLiquidationPoolPosition'
 export * from './instructions/createVault'
 export * from './instructions/depositVault'
 export * from './instructions/withdrawVault'

package/src/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -0,0 +1,31 @@
+import { Program, Provider } from '@project-serum/anchor'
+import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+
+export async function closeClaimedLiquidationPoolPosition(
+  program: Program<Vault>,
+  provider: Provider,
+  poolPosition: PublicKey,
+  payer: Signer
+): Promise<PublicKey> {
+  const transaction = new Transaction().add(await closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer.publicKey))
+
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  return poolPosition
+}
+
+export async function closeClaimedLiquidationPoolPositionInstruction(
+  program: Program<Vault>,
+  poolPosition: PublicKey,
+  payer: PublicKey
+): Promise<TransactionInstruction> {
+  return program.methods
+    .closeClaimedLiquidationPoolPosition()
+    .accounts({
+      poolPosition: poolPosition,
+      payer: payer
+    })
+    .instruction()
+}

package/src/instructions/liquidateVault.ts

@@ -124,6 +124,7 @@ export async function liquidateVault(
       overrideTime
     )
   )
+
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history, newEra])
   return vaultPublicKey
 }

package/src/instructions/withdrawStakingPool.ts

@@ -27,7 +27,7 @@ export async function withdrawStakingPool(
   payer: Signer,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
-  overrideStartTime?: number
+  overrideStartTime?: number,
 ): Promise<PublicKey> {
   const poolPosition = Keypair.generate()
   const transaction = new Transaction().add(
@@ -39,6 +39,7 @@ export async function withdrawStakingPool(
       overrideStartTime
     )
   )
+
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }

package/src/state/VaultAccount.ts

@@ -26,7 +26,7 @@ export class VaultAccount {
   denormalizedDebt: number
 
   /** The ordered number of when this vault was created. */
-  vaultNumber: number
+  vaultNumber = 0
 
   /** Debt redistribution snapshot */
   debtProductSnapshotBytes = new Decimal(0)
@@ -49,10 +49,12 @@ export class VaultAccount {
   constructor(vault: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
-    this.vaultNumber = vault.vaultNumber?.toNumber()
     this.pdaSalt = vault.pdaSalt
     this.deposited = vault.deposited?.toNumber()
     this.denormalizedDebt = vault.denormalizedDebt?.toNumber()
+    if (vault.vaultNumber) {
+      this.vaultNumber = vault.vaultNumber.toNumber()
+    }
     if (vault.debtProductSnapshotBytes) {
       this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
     }
@@ -163,7 +165,7 @@ export class VaultAccount {
       nextVault = this.nextVaultToRedeem.toString().substring(0, 6)
     }
 
-    return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${
+    return `${this.publicKey.toString().substring(0, 6)}. Debt: ${
       this.denormalizedDebt
     } Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `
   }
@@ -180,7 +182,7 @@ export class VaultAccount {
    * @returns a new VaultAccount
    */
   static FromMiniSlice(data: Buffer, pubkey: PublicKey) {
-    const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')]
+    const props = [borsh.u64('deposited'), borsh.u64('denormalizedDebt')]
     const miniVaultLayout = borsh.struct(props, 'minVaultLayout')
     const decodedData: any = miniVaultLayout.decode(data)
 

package/src/utils/getLinkedListAccounts.ts

@@ -183,7 +183,7 @@ function sortVaults(a: VaultAccount, b: VaultAccount) {
   const aRatio = a.deposited / a.denormalizedDebt
   const bRatio = b.deposited / b.denormalizedDebt
   if (aRatio === bRatio) {
-    return b.vaultNumber - a.vaultNumber
+    return a.publicKey.toString() > b.publicKey.toString() ? 1 : -1
   }
   return aRatio - bRatio
 }
@@ -215,8 +215,8 @@ async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: Public
     // Slice the data only to grab the 3 u64's of size 8 bytes each
     dataSlice: {
       // See programs/hedge-vault/src/account_data/vault.rs for struct layout
-      offset: 8 + 32,
-      length: 24,
+      offset: 8 + 32 + 8,
+      length: 16,
     },
   })