hedge-web3 0.1.46 → 0.1.50

package/declarations/idl/vault.d.ts

@@ -1649,58 +1649,6 @@ export declare type Vault = {
                     };
                 }
             ];
-        },
-        {
-            "name": "adminMigrateVault";
-            "accounts": [
-                {
-                    "name": "payer";
-                    "isMut": true;
-                    "isSigner": true;
-                },
-                {
-                    "name": "vaultSystemState";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "vaultAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "vaultTypeAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                }
-            ];
-            "args": [];
-        },
-        {
-            "name": "adminMigrateOracle";
-            "accounts": [
-                {
-                    "name": "payer";
-                    "isMut": true;
-                    "isSigner": true;
-                },
-                {
-                    "name": "vaultSystemState";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "oracleInfoAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "vaultTypeAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                }
-            ];
-            "args": [];
         }
     ];
     "accounts": [
@@ -1896,7 +1844,7 @@ export declare type Vault = {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "vaultTypeName";
+                        "name": "collateralType";
                         "type": "string";
                     },
                     {
@@ -1910,10 +1858,6 @@ export declare type Vault = {
                     {
                         "name": "oracleSwitchboard";
                         "type": "publicKey";
-                    },
-                    {
-                        "name": "vaultType";
-                        "type": "publicKey";
                     }
                 ];
             };
@@ -2158,7 +2102,7 @@ export declare type Vault = {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "vaultTypeName";
+                        "name": "collateralType";
                         "type": "string";
                     },
                     {
@@ -2242,14 +2186,6 @@ export declare type Vault = {
                     {
                         "name": "deprecated";
                         "type": "bool";
-                    },
-                    {
-                        "name": "totalFeesAccumulatedUsh";
-                        "type": "u128";
-                    },
-                    {
-                        "name": "totalFeesAccumulatedCollateral";
-                        "type": "u128";
                     }
                 ];
             };
@@ -2276,7 +2212,7 @@ export declare type Vault = {
                         "type": "u64";
                     },
                     {
-                        "name": "vaultTypeName";
+                        "name": "collateralType";
                         "type": "string";
                     },
                     {
@@ -2324,10 +2260,6 @@ export declare type Vault = {
                         "type": {
                             "option": "publicKey";
                         };
-                    },
-                    {
-                        "name": "vaultType";
-                        "type": "publicKey";
                     }
                 ];
             };
@@ -2741,8 +2673,8 @@ export declare type Vault = {
         },
         {
             "code": 6020;
-            "name": "NotRedeemingLowestCollateralRatioVault";
-            "msg": "Can only redeem lowest collateral ratio vault in system.";
+            "name": "RedeemingNonHighestCollateralRatioVault";
+            "msg": "Can only redeem highest collateral ratio vault in system.";
         },
         {
             "code": 6021;
@@ -2756,11 +2688,6 @@ export declare type Vault = {
         },
         {
             "code": 6023;
-            "name": "InvalidSaltLength";
-            "msg": "Salt for new vaults must be of length 8";
-        },
-        {
-            "code": 6024;
             "name": "UpdateVaultTypeBadMaxDebtExtended";
             "msg": "New Max debt extended value is less than the current debt!";
         }

package/declarations/instructions/liquidateVault.d.ts

@@ -2,4 +2,4 @@ import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
 export declare function liquidateVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, overrideTime?: number): Promise<PublicKey>;
-export declare function liquidateVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, vaultTypeAccount: PublicKey, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function liquidateVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, collateralType: string, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/state/VaultAccount.d.ts

@@ -12,23 +12,21 @@ export declare class VaultAccount {
     /** The public key of the vault owner. */
     pdaSalt: string;
     /** The deposited collateral of the vault (in SOL Lamports). */
-    deposited: number;
+    deposited: Decimal;
     /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
-    denormalizedDebt: number;
+    denormalizedDebt: Decimal;
     /** The ordered number of when this vault was created. */
     vaultNumber: number;
     /** Debt redistribution snapshot */
     debtProductSnapshotBytes: Decimal;
     /** Collateral redistribution snapshot' */
     collateralAccumulatorSnapshotBytes: Decimal;
-    /** The vault type eg '2-SOL-150-0' */
-    vaultTypeName: string;
+    /** The vault type eg 'SOL-150' */
+    collateralType: string;
     /** Current State of the vault ("Open", "Closed", "Liquidated") */
     vaultStatus: string;
     /** The public key of the next vault to redeem. */
     nextVaultToRedeem: PublicKey;
-    /** The public key of the vault type. */
-    vaultType: PublicKey;
     constructor(vault: any, publicKey: PublicKey);
     /**
      * Check if some `PublicKey` is the owner
@@ -59,7 +57,7 @@ export declare class VaultAccount {
     addDeposit(depositAmount: number): void;
     redeem(): void;
     liquidate(): void;
-    updateDebtAndCollateral(vaultTypeAccountData: any): void;
+    updateDebtAndCollateral(vaultTypeAccuntData: any): void;
     toString(highlight: PublicKey): string;
     /**
      * Creates a VaultAccount from a slice of data

package/lib/idl/vault.js

@@ -1652,58 +1652,6 @@ exports.IDL = {
                     }
                 }
             ]
-        },
-        {
-            "name": "adminMigrateVault",
-            "accounts": [
-                {
-                    "name": "payer",
-                    "isMut": true,
-                    "isSigner": true
-                },
-                {
-                    "name": "vaultSystemState",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "vaultAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "vaultTypeAccount",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": []
-        },
-        {
-            "name": "adminMigrateOracle",
-            "accounts": [
-                {
-                    "name": "payer",
-                    "isMut": true,
-                    "isSigner": true
-                },
-                {
-                    "name": "vaultSystemState",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "oracleInfoAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "vaultTypeAccount",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": []
         }
     ],
     "accounts": [
@@ -1899,7 +1847,7 @@ exports.IDL = {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "vaultTypeName",
+                        "name": "collateralType",
                         "type": "string"
                     },
                     {
@@ -1913,10 +1861,6 @@ exports.IDL = {
                     {
                         "name": "oracleSwitchboard",
                         "type": "publicKey"
-                    },
-                    {
-                        "name": "vaultType",
-                        "type": "publicKey"
                     }
                 ]
             }
@@ -2161,7 +2105,7 @@ exports.IDL = {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "vaultTypeName",
+                        "name": "collateralType",
                         "type": "string"
                     },
                     {
@@ -2245,14 +2189,6 @@ exports.IDL = {
                     {
                         "name": "deprecated",
                         "type": "bool"
-                    },
-                    {
-                        "name": "totalFeesAccumulatedUsh",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "totalFeesAccumulatedCollateral",
-                        "type": "u128"
                     }
                 ]
             }
@@ -2279,7 +2215,7 @@ exports.IDL = {
                         "type": "u64"
                     },
                     {
-                        "name": "vaultTypeName",
+                        "name": "collateralType",
                         "type": "string"
                     },
                     {
@@ -2327,10 +2263,6 @@ exports.IDL = {
                         "type": {
                             "option": "publicKey"
                         }
-                    },
-                    {
-                        "name": "vaultType",
-                        "type": "publicKey"
                     }
                 ]
             }
@@ -2744,8 +2676,8 @@ exports.IDL = {
         },
         {
             "code": 6020,
-            "name": "NotRedeemingLowestCollateralRatioVault",
-            "msg": "Can only redeem lowest collateral ratio vault in system."
+            "name": "RedeemingNonHighestCollateralRatioVault",
+            "msg": "Can only redeem highest collateral ratio vault in system."
         },
         {
             "code": 6021,
@@ -2759,11 +2691,6 @@ exports.IDL = {
         },
         {
             "code": 6023,
-            "name": "InvalidSaltLength",
-            "msg": "Salt for new vaults must be of length 8"
-        },
-        {
-            "code": 6024,
             "name": "UpdateVaultTypeBadMaxDebtExtended",
             "msg": "New Max debt extended value is less than the current debt!"
         }

package/lib/instructions/createStakingPool.js

@@ -26,7 +26,6 @@ function createStakingPool(program, provider, payer, mintPublicKey, hedgeTokensT
 exports.createStakingPool = createStakingPool;
 function createStakingPoolInstruction(program, payerPublicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("new createStakingPoolInstruction");
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);

package/lib/instructions/depositVault.js

@@ -16,15 +16,15 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
-const token_instructions_1 = require("@project-serum/serum/lib/token-instructions");
 function depositVault(program, provider, payer, vaultPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         // Prep the user to get USH back out at some point
         yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true);
         const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payer.publicKey, vaultTypeAccountInfo.collateralMint);
         const vaultAssociatedCollateralAccountPublicKey = yield (0, Constants_1.findAssociatedTokenAddress)(vaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const history = web3_js_1.Keypair.generate();
@@ -34,8 +34,8 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, depositAmount, 0, false, false);
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, 0, false, false);
+        if (vaultAccount.collateralType === 'SOL') {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
                 lamports: depositAmount + 2.04e6,
@@ -49,8 +49,8 @@ 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));
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime));
+        if (vaultAccount.collateralType === 'SOL') {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
                 destination: payer.publicKey,

package/lib/instructions/liquidateVault.js

@@ -18,7 +18,8 @@ const Constants_1 = require("../Constants");
 function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -29,23 +30,24 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, hedgeStakingPoolPublicKey, true);
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, vaultPublicKey, true);
         const poolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, liquidationPoolStatePublicKey, true);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, vaultAccount.vaultType, true);
+        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, vaultTypeAccountPublicKey, true);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, hedgeStakingPoolPublicKey, true);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, 0, false, true);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, 0, false, true);
         const history = web3_js_1.Keypair.generate();
         const newEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();
-        transaction.add(yield liquidateVaultInstruction(program, payer.publicKey, payerAssociatedTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, liquidationPoolStatePublicKey, poolStateInfo.currentEra, poolAssociatedTokenAccount.address, history.publicKey, newEra.publicKey, hedgeStakingPoolPublicKey, feePoolAssociatedTokenAccount.address, hedgeStakingPoolAssociatedUshTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultAccount.vaultType, overrideTime));
+        transaction.add(yield liquidateVaultInstruction(program, payer.publicKey, payerAssociatedTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, liquidationPoolStatePublicKey, poolStateInfo.currentEra, poolAssociatedTokenAccount.address, history.publicKey, newEra.publicKey, hedgeStakingPoolPublicKey, feePoolAssociatedTokenAccount.address, hedgeStakingPoolAssociatedUshTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultAccount.collateralType, overrideTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history, newEra]);
         return vaultPublicKey;
     });
 }
 exports.liquidateVault = liquidateVault;
-function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, poolState, poolEra, poolAssociatedTokenAccount, historyPublicKey, newEraPublicKey, feePool, feePoolAssociatedTokenAccount, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultTypeAccount, overrideTime) {
+function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, poolState, poolEra, poolAssociatedTokenAccount, historyPublicKey, newEraPublicKey, feePool, feePoolAssociatedTokenAccount, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, collateralType, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const liquidationPoolUshAccountPublickey = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
+        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
         return yield program.methods
             .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )

package/lib/instructions/loanVault.js

@@ -15,20 +15,19 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
-const Errors_1 = require("../utils/Errors");
-const fs = require('fs');
 function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultAccount.vaultType, true);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultTypeAccountPublicKey, true);
         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 [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, 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));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]).catch(Errors_1.parseAnchorErrors);
+        const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime));
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }

package/lib/instructions/redeemVault.js

@@ -22,13 +22,14 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         // Prep the user to get USH back out at some point
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true);
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultPublicKey, true);
         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 [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, redeemAmount, transactionOverrideTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });

package/lib/instructions/refreshOraclePrice.js

@@ -32,7 +32,7 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
             .accounts({
             oracleInfoAccount: oracleInfoAccount,
             vaultTypeAccount: vaultTypeAccount,
-            oracleChainlink: chainlinkAccounts[network],
+            oracleChainlink: chainlinkAccunts[network],
             oraclePyth: pythAccounts[network],
             oracleSwitchboard: switchboardAccounts[network],
             systemProgram: web3_js_1.SystemProgram.programId,
@@ -52,7 +52,7 @@ const pythAccounts = {
     Devnet: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
     MainnetBeta: new web3_js_1.PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'),
 };
-const chainlinkAccounts = {
+const chainlinkAccunts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
     MainnetBeta: web3_js_1.SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET

package/lib/instructions/repayVault.js

@@ -21,12 +21,13 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         // Prep the user to get USH back out at some point
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultAccount.vaultType, vaultTypeAccount.collateralMint);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultTypeAccountPublicKey, vaultTypeAccount.collateralMint);
         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 [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });

package/lib/instructions/withdrawVault.js

@@ -24,14 +24,15 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const history = web3_js_1.Keypair.generate();
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
         const vaultAssociatedCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, serum_1.TokenInstructions.WRAPPED_SOL_MINT, vaultPublicKey, true);
-        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
+        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true);
         const destinationTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
         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 [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });