hedge-web3 0.2.2 → 0.2.8

package/declarations/idl/vault.d.ts

@@ -1708,7 +1708,7 @@ export declare type Vault = {
             "args": [];
         },
         {
-            "name": "closeClaimedLiquidationPool";
+            "name": "closeClaimedLiquidationPoolPosition";
             "accounts": [
                 {
                     "name": "payer";
@@ -1722,6 +1722,38 @@ export declare type Vault = {
                 }
             ];
             "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": [
@@ -2819,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/instructions/createVault.d.ts

@@ -1,6 +1,7 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function createVault(program: Program<Vault>, provider: Provider, payer: Signer, collateralType: string, depositAmount: number, overrideTime?: number): Promise<PublicKey>;
 export declare function buildCreateVaultTransaction(program: Program<Vault>, payerPublicKey: PublicKey, collateralType: string, depositAmount: number, overrideTime?: number): Promise<[Transaction, Signer[], PublicKey]>;
-export declare function createVaultInstruction(program: Program<Vault>, salt: string, payerPublicKey: PublicKey, payerTokenAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, feePool: PublicKey, feePoolAssociatedUshTokenAccount: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, historyPublicKey: PublicKey, ushMintPublickey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function createVaultInstruction(program: Program<Vault>, salt: string, payerPublicKey: PublicKey, payerTokenAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, feePool: PublicKey, feePoolAssociatedUshTokenAccount: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, historyPublicKey: PublicKey, ushMintPublickey: PublicKey, depositAmount: BN, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositLiquidationPool.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
-export declare function depositLiquidationPool(program: Program<Vault>, provider: Provider, payer: Signer, depositAmount: number, overrideStartTime?: number): Promise<PublicKey>;
-export declare function depositLiquidationPoolInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerUshAccount: PublicKey, poolPositionPublicKey: PublicKey, depositAmount: number, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function depositLiquidationPool(program: Program<Vault>, provider: Provider, payer: Signer, depositAmount: BN, overrideStartTime?: number): Promise<PublicKey>;
+export declare function depositLiquidationPoolInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerUshAccount: PublicKey, poolPositionPublicKey: PublicKey, depositAmount: BN, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositStakingPool.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function depositStakingPool(program: Program<Vault>, provider: Provider, payer: Signer, mintPublicKey: PublicKey, depositAmount: number, overrideStartTime?: number): Promise<PublicKey>;
-export declare function depositStakingPoolInstruction(program: Program<Vault>, payerPublicKey: PublicKey, poolPositionPublicKey: PublicKey, stakedTokenMintPublicKey: PublicKey, depositAmount: number, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function depositStakingPoolInstruction(program: Program<Vault>, payerPublicKey: PublicKey, poolPositionPublicKey: PublicKey, stakedTokenMintPublicKey: PublicKey, depositAmount: BN, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositVault.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function depositVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, depositAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function depositVaultInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, vaultOwner: PublicKey, vaultOwnerTokenAccount: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccountPublicKey: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, ushMintPublickey: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function depositVaultInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, vaultOwner: PublicKey, vaultOwnerTokenAccount: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccountPublicKey: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, ushMintPublickey: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, depositAmount: BN, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/loanVault.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function loanVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, loanAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function loanVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, loanAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function loanVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, loanAmount: BN, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/redeemVault.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function redeemVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, redeemAmount: number, transactionOverrideTime?: number): Promise<PublicKey>;
-export declare function redeemVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerUshAccount: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, redeemAmount: number, transactionOverrideTime?: number): Promise<TransactionInstruction>;
+export declare function redeemVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerUshAccount: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, redeemAmount: BN, transactionOverrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/repayVault.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function repayVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, repayAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function repayVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, repayAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function repayVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, repayAmount: BN, overrideTime?: number): 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/declarations/instructions/withdrawVault.d.ts

@@ -1,5 +1,6 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
 export declare function withdrawVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, withdrawAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function withdrawVaultInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedCollateralPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, ushMint: PublicKey, historyPublicKey: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, withdrawAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function withdrawVaultInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedCollateralPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, ushMint: PublicKey, historyPublicKey: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, withdrawAmount: BN, overrideTime?: number): Promise<TransactionInstruction>;

package/lib/idl/vault.js

@@ -1711,7 +1711,7 @@ exports.IDL = {
             "args": []
         },
         {
-            "name": "closeClaimedLiquidationPool",
+            "name": "closeClaimedLiquidationPoolPosition",
             "accounts": [
                 {
                     "name": "payer",
@@ -1725,6 +1725,38 @@ exports.IDL = {
                 }
             ],
             "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": [
@@ -2822,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/instructions/closeClaimedLiquidationPoolPosition.js

@@ -27,7 +27,7 @@ exports.closeClaimedLiquidationPoolPosition = closeClaimedLiquidationPoolPositio
 function closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer) {
     return __awaiter(this, void 0, void 0, function* () {
         return program.methods
-            .closeClaimedLiquidationPool()
+            .closeClaimedLiquidationPoolPosition()
             .accounts({
             poolPosition: poolPosition,
             payer: payer

package/lib/instructions/createVault.js

@@ -53,7 +53,7 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, depositAmount, overrideTime));
+        transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
@@ -108,7 +108,7 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
             signers.push(wrappedSolAccount);
         }
         console.log('hedgeStakingPoolPublicKey', hedgeStakingPoolPublicKey.toString());
-        transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, depositAmount, overrideTime));
+        transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,

package/lib/instructions/depositLiquidationPool.js

@@ -24,7 +24,7 @@ function depositLiquidationPool(program, provider, payer, depositAmount, overrid
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const poolPosition = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, payerUshAccount.address, poolPosition.publicKey, depositAmount, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, payerUshAccount.address, poolPosition.publicKey, new anchor_1.BN(depositAmount), overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
@@ -38,7 +38,7 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, payerUshAcco
         const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         return yield program.methods
-            .depositLiquidationPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+            .depositLiquidationPool(depositAmount, new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )
             .accounts({
             vaultSystemState: vaultSystemState,

package/lib/instructions/depositStakingPool.js

@@ -22,7 +22,7 @@ const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfi
 function depositStakingPool(program, provider, payer, mintPublicKey, depositAmount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const poolPosition = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield depositStakingPoolInstruction(program, payer.publicKey, poolPosition.publicKey, mintPublicKey, depositAmount, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield depositStakingPoolInstruction(program, payer.publicKey, poolPosition.publicKey, mintPublicKey, new anchor_1.BN(depositAmount), overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
@@ -35,7 +35,7 @@ function depositStakingPoolInstruction(program, payerPublicKey, poolPositionPubl
         const payersArbitraryTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, stakedTokenMintPublicKey);
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         return yield program.methods
-            .depositStakingPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+            .depositStakingPool(depositAmount, new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )
             .accounts({
             payer: payerPublicKey,

package/lib/instructions/depositVault.js

@@ -53,7 +53,7 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime));
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(depositAmount), overrideTime));
         if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
@@ -69,7 +69,7 @@ exports.depositVault = depositVault;
 function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
-            .depositVault(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+            .depositVault(depositAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,

package/lib/instructions/loanVault.js

@@ -29,7 +29,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultPublicKey, true);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, loanAmount, false, false);
         const history = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime));
+        const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
@@ -43,7 +43,7 @@ function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPub
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         return yield program.methods
-            .loanVault(new anchor_1.BN(loanAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+            .loanVault(loanAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,

package/lib/instructions/redeemVault.js

@@ -32,7 +32,7 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         const payerTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, 0, true, false);
         const history = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield redeemVaultInstruction(program, payer.publicKey, payerUshAccount.address, payerTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, redeemAmount, transactionOverrideTime));
+        const transaction = new web3_js_1.Transaction().add(yield redeemVaultInstruction(program, payer.publicKey, payerUshAccount.address, payerTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(redeemAmount), transactionOverrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
@@ -46,7 +46,7 @@ function redeemVaultInstruction(program, payerPublicKey, payerUshAccount, destin
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         return yield program.methods
-            .redeemVault(new anchor_1.BN(redeemAmount), new anchor_1.BN(transactionOverrideTime !== null && transactionOverrideTime !== void 0 ? transactionOverrideTime : Date.now() / 1000) // override start time
+            .redeemVault(redeemAmount, new anchor_1.BN(transactionOverrideTime !== null && transactionOverrideTime !== void 0 ? transactionOverrideTime : Date.now() / 1000) // override start time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,

package/lib/instructions/repayVault.js

@@ -30,7 +30,7 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultPublicKey, vaultTypeAccount.collateralMint);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, repayAmount * -1, false, false);
         const history = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime));
+        const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(repayAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
@@ -44,7 +44,7 @@ function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPu
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         return yield program.methods
-            .repayVault(new anchor_1.BN(repayAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+            .repayVault(repayAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,

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/instructions/withdrawVault.js

@@ -35,7 +35,7 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, withdrawAmount * -1, 0, false, false);
-        const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime));
+        const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(withdrawAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
@@ -44,7 +44,7 @@ exports.withdrawVault = withdrawVault;
 function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMint, historyPublicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
-            .withdrawVault(new anchor_1.BN(withdrawAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+            .withdrawVault(withdrawAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,

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.2",
+  "version": "0.2.8",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/idl/vault.ts

@@ -1708,7 +1708,7 @@ export type Vault = {
       "args": []
     },
     {
-      "name": "closeClaimedLiquidationPool",
+      "name": "closeClaimedLiquidationPoolPosition",
       "accounts": [
         {
           "name": "payer",
@@ -1722,6 +1722,38 @@ export type Vault = {
         }
       ],
       "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": [
@@ -2819,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"
     }
@@ -4555,7 +4597,7 @@ export const IDL: Vault = {
       "args": []
     },
     {
-      "name": "closeClaimedLiquidationPool",
+      "name": "closeClaimedLiquidationPoolPosition",
       "accounts": [
         {
           "name": "payer",
@@ -4569,6 +4611,38 @@ export const IDL: Vault = {
         }
       ],
       "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": [
@@ -5666,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/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -22,7 +22,7 @@ export async function closeClaimedLiquidationPoolPositionInstruction(
   payer: PublicKey
 ): Promise<TransactionInstruction> {
   return program.methods
-    .closeClaimedLiquidationPool()
+    .closeClaimedLiquidationPoolPosition()
     .accounts({
       poolPosition: poolPosition,
       payer: payer

package/src/instructions/createVault.ts

@@ -93,7 +93,7 @@ export async function createVault(
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
       ushMintPublickey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -187,7 +187,7 @@ export async function buildCreateVaultTransaction(
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
       ushMintPublickey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -221,7 +221,7 @@ export async function createVaultInstruction(
   collateralMint: PublicKey,
   historyPublicKey: PublicKey,
   ushMintPublickey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()

package/src/instructions/depositLiquidationPool.ts

@@ -24,7 +24,7 @@ export async function depositLiquidationPool(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<PublicKey> {
   const ushMintPublickey = await getUshMintPublicKey()
@@ -42,7 +42,7 @@ export async function depositLiquidationPool(
       payer.publicKey,
       payerUshAccount.address,
       poolPosition.publicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideStartTime
     )
   )
@@ -55,7 +55,7 @@ export async function depositLiquidationPoolInstruction(
   payerPublicKey: PublicKey,
   payerUshAccount: PublicKey,
   poolPositionPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
@@ -68,7 +68,7 @@ export async function depositLiquidationPoolInstruction(
 
   return await program.methods
     .depositLiquidationPool(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
     )
     .accounts({

package/src/instructions/depositStakingPool.ts

@@ -30,7 +30,7 @@ export async function depositStakingPool(
       payer.publicKey,
       poolPosition.publicKey,
       mintPublicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideStartTime
     )
   )
@@ -43,7 +43,7 @@ export async function depositStakingPoolInstruction(
   payerPublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
   const [poolPublickey] = await getPoolPublicKeyForMint(stakedTokenMintPublicKey)
@@ -53,7 +53,7 @@ export async function depositStakingPoolInstruction(
 
   return await program.methods
     .depositStakingPool(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
     )
     .accounts({

package/src/instructions/depositVault.ts

@@ -111,7 +111,7 @@ export async function depositVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -146,12 +146,12 @@ export async function depositVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   return await program.methods
     .depositVault(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/loanVault.ts

@@ -82,7 +82,7 @@ export async function loanVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      loanAmount,
+      new BN(loanAmount),
       overrideTime
     )
   )
@@ -102,7 +102,7 @@ export async function loanVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  loanAmount: number,
+  loanAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -116,7 +116,7 @@ export async function loanVaultInstruction(
 
   return await program.methods
     .loanVault(
-      new BN(loanAmount),
+      loanAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/redeemVault.ts

@@ -91,7 +91,7 @@ export async function redeemVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      redeemAmount,
+      new BN(redeemAmount),
       transactionOverrideTime
     )
   )
@@ -112,7 +112,7 @@ export async function redeemVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  redeemAmount: number,
+  redeemAmount: BN,
   transactionOverrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -125,7 +125,7 @@ export async function redeemVaultInstruction(
   )
   return await program.methods
     .redeemVault(
-      new BN(redeemAmount),
+      redeemAmount,
       new BN(transactionOverrideTime ?? Date.now() / 1000) // override start time
     )
     .accounts({

package/src/instructions/repayVault.ts

@@ -72,7 +72,7 @@ export async function repayVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      repayAmount,
+      new BN(repayAmount),
       overrideTime
     )
   )
@@ -92,7 +92,7 @@ export async function repayVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  repayAmount: number,
+  repayAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -106,7 +106,7 @@ export async function repayVaultInstruction(
 
   return await program.methods
     .repayVault(
-      new BN(repayAmount),
+      repayAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/withdrawVault.ts

@@ -95,7 +95,7 @@ export async function withdrawVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      withdrawAmount,
+      new BN(withdrawAmount),
       overrideTime
     )
   )
@@ -119,12 +119,12 @@ export async function withdrawVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  withdrawAmount: number,
+  withdrawAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   return await program.methods
     .withdrawVault(
-      new BN(withdrawAmount),
+      withdrawAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

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,
     },
   })