hedge-web3 0.2.8 → 0.2.11

package/declarations/Constants.d.ts

@@ -4,13 +4,60 @@ export declare const HEDGE_PROGRAM_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_SOL_USD_ID = "FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf";
 export declare const CHAINLINK_SOL_USD_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
+/**
+ * @returns The Liquidation pool public key
+ */
 export declare function getLiquidationPoolStatePublicKey(): Promise<PublicKey>;
+/**
+ *
+ * @returns The liquidation pool ush account public key
+ */
 export declare function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey>;
+/**
+ *
+ * @returns The USH mint public key
+ */
 export declare function getUshMintPublicKey(): Promise<PublicKey>;
+/**
+ *
+ * @returns The Vault System State public key
+ */
 export declare function getVaultSystemStatePublicKey(): Promise<PublicKey>;
+/**
+ *
+ * @returns The HDG mint public key
+ */
 export declare function getHedgeMintPublicKey(): Promise<PublicKey>;
+/**
+ * Get the public key for any staking pool
+ *
+ * @param mintPublicKey Staked collateral mint public key
+ * @returns the public key for that staking pool
+ */
 export declare function getPoolPublicKeyForMint(mintPublicKey: PublicKey): Promise<[PublicKey, number, string]>;
+/**
+ *
+ * @param collateralType String name of the collateral type (must be 16 chars)
+ * @returns The public key for that Vault Type account
+ */
 export declare function getVaultTypeAccountPublicKey(collateralType: string): Promise<PublicKey>;
+/**
+ *
+ * @param collateralType String name of the collateral type (must be 16 chars)
+ * @returns The public key for that Vault Type oracle info
+ */
 export declare function getVaultTypeOracleAccountPublicKey(collateralType: string): Promise<PublicKey>;
+/**
+ * Vaults are stored in PDA accounts. Use this to get the address from a salt
+ *
+ * @param vaultSalt String salt for the vault (must be 8 chars)
+ * @returns The public key for that Vault Type oracle info
+ */
 export declare function findVaultAddress(vaultSalt: string): Promise<PublicKey>;
+/**
+ *
+ * @param walletAddress Owner public key
+ * @param tokenMintAddress Token mint
+ * @returns The associated token account public key
+ */
 export declare function findAssociatedTokenAddress(walletAddress: PublicKey, tokenMintAddress: PublicKey): Promise<PublicKey>;

package/declarations/idl/pyth.d.ts

@@ -0,0 +1,80 @@
+export declare type Pyth = {
+    "version": "0.1.0";
+    "name": "pyth";
+    "instructions": [
+        {
+            "name": "initialize";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "price";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "systemProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                }
+            ];
+            "args": [
+                {
+                    "name": "price";
+                    "type": "i64";
+                },
+                {
+                    "name": "expo";
+                    "type": "i32";
+                },
+                {
+                    "name": "conf";
+                    "type": "u64";
+                }
+            ];
+        },
+        {
+            "name": "setPrice";
+            "accounts": [
+                {
+                    "name": "price";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [
+                {
+                    "name": "price";
+                    "type": "i64";
+                }
+            ];
+        }
+    ];
+    "accounts": [
+        {
+            "name": "priceWrapper";
+            "type": {
+                "kind": "struct";
+                "fields": [
+                    {
+                        "name": "price";
+                        "type": {
+                            "defined": "Price";
+                        };
+                    }
+                ];
+            };
+        }
+    ];
+    "errors": [
+        {
+            "code": 6000;
+            "name": "InvalidTradingStatus";
+            "msg": "invalid trading status";
+        }
+    ];
+};
+export declare const IDL: Pyth;

package/declarations/idl/vault.d.ts

@@ -1754,6 +1754,47 @@ export declare type Vault = {
                 }
             ];
             "args": [];
+        },
+        {
+            "name": "adminResetVault";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "vaultSystemState";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultAssociatedTokenAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultTypeAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultTypeAssociatedTokenAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [
+                {
+                    "name": "amountToSendFromVaultType";
+                    "type": "u64";
+                }
+            ];
         }
     ];
     "accounts": [
@@ -2558,9 +2599,6 @@ export declare type Vault = {
                     },
                     {
                         "name": "Distributed";
-                    },
-                    {
-                        "name": "Redeemed";
                     }
                 ];
             };

package/declarations/state/VaultAccount.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
+import BN from 'bn.js';
 import VaultType from './VaultType';
 /**
  * A class that represents an on-chian vault.
@@ -13,9 +14,9 @@ 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: BN;
     /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
-    denormalizedDebt: number;
+    denormalizedDebt: BN;
     /** The ordered number of when this vault was created. */
     vaultNumber: number;
     /** Debt redistribution snapshot */
@@ -38,12 +39,6 @@ export declare class VaultAccount {
      * @returns true if publicKey matches the owner publicKey
      */
     isOwnedBy(publicKey: PublicKey): boolean;
-    /**
-     * Get the collateral value in SOL
-     *
-     * @returns collateral value in SOL
-     */
-    inSol(): number;
     /**
      * Get the debt value in USH
      *
@@ -56,8 +51,36 @@ export declare class VaultAccount {
      * @returns example: `1b6ca...azy71s`
      */
     toDisplayString(): string;
-    addDebt(additionalDebt: Decimal, vaultTypeAccount: VaultType): void;
-    addDeposit(depositAmount: number): void;
+    /**
+     * Add additional debt to the vault.
+     *
+     * @param {BN} additionalDebt - Additional normalized debt to add in (USH) lamports.
+     * @param {VaultType} vaultTypeAccount - Vault's vaultType
+     *
+     */
+    addDebt(additionalDebt: BN, vaultTypeAccount: VaultType): void;
+    /**
+     * Repay debt on a vault
+     *
+     * @param {BN} repayAmount - Normalized debt to repay in (USH) lamports.
+     * @param {VaultType} vaultTypeAccount - Vault's vaultType
+     *
+     */
+    repayDebt(repayAmount: BN, vaultTypeAccount: VaultType): void;
+    /**
+     * Deposit Collateral
+     *
+     * @param {BN} depositAmount - Amount to deposit in (CollateralMint) lamports
+     *
+     */
+    depositCollateral(depositAmount: BN): void;
+    /**
+     * Withdraw Collateral
+     *
+     * @param {BN} withdrawAmount - Amount to withdraw in (CollateralMint) lamports
+     *
+     */
+    withdrawCollateral(withdrawAmount: BN): void;
     redeem(): void;
     liquidate(): void;
     updateDebtAndCollateral(vaultTypeAccountData: VaultType): void;

package/declarations/utils/getLinkedListAccounts.d.ts

@@ -1,5 +1,20 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { Program, BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { VaultAccount } from '../state/VaultAccount';
 import { Vault } from '../idl/vault';
-export declare function getLinkedListAccounts(program: Program<Vault>, provider: Provider, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: number, loanAmount: number, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[]): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;
+/**
+ * Get the accounts the left and right for re-inserting in the linked list
+ *
+ * @param {Program<Vault>} program - Anchor program <Vault ILD>
+ * @param {PublicKey} vaultTypeAccountPublicKey - Vault Type Account PublicKey
+ * @param {PublicKey} vaultPublicKey - Vault Account PublicKey
+ * @param {BN} depositAmount - Amount that will be deposited into vault with instruction
+ * @param {BN} withdrawAmount - Amount that will be withdrawn from vault with instruction
+ * @param {BN} loanAmount - Amount that will be deposited into vault with transaction (sans fees)
+ * @param {BN} repayAmount - Amount that will be repaid into vault with transaction
+ * @param {boolean} redeem - True if vault is going to be redeemed fully
+ * @param {boolean} liquidate - True if vault is going to be liquidated fully
+ * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ */
+export declare function getLinkedListAccounts(program: Program<Vault>, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: BN, withdrawAmount: BN, loanAmount: BN, repayAmount: BN, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[]): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;

package/lib/Constants.js

@@ -18,6 +18,9 @@ exports.CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf';
 exports.CHAINLINK_SOL_USD_PUBLICKEY = new web3_js_1.PublicKey(exports.CHAINLINK_SOL_USD_ID);
 exports.CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
 const enc = new TextEncoder();
+/**
+ * @returns The Liquidation pool public key
+ */
 function getLiquidationPoolStatePublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -25,6 +28,10 @@ function getLiquidationPoolStatePublicKey() {
     });
 }
 exports.getLiquidationPoolStatePublicKey = getLiquidationPoolStatePublicKey;
+/**
+ *
+ * @returns The liquidation pool ush account public key
+ */
 function getLiquidationPoolUshAccountPublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -32,6 +39,10 @@ function getLiquidationPoolUshAccountPublicKey() {
     });
 }
 exports.getLiquidationPoolUshAccountPublicKey = getLiquidationPoolUshAccountPublicKey;
+/**
+ *
+ * @returns The USH mint public key
+ */
 function getUshMintPublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [findMintPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('UshMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -39,6 +50,10 @@ function getUshMintPublicKey() {
     });
 }
 exports.getUshMintPublicKey = getUshMintPublicKey;
+/**
+ *
+ * @returns The Vault System State public key
+ */
 function getVaultSystemStatePublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -46,6 +61,10 @@ function getVaultSystemStatePublicKey() {
     });
 }
 exports.getVaultSystemStatePublicKey = getVaultSystemStatePublicKey;
+/**
+ *
+ * @returns The HDG mint public key
+ */
 function getHedgeMintPublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -53,6 +72,12 @@ function getHedgeMintPublicKey() {
     });
 }
 exports.getHedgeMintPublicKey = getHedgeMintPublicKey;
+/**
+ * Get the public key for any staking pool
+ *
+ * @param mintPublicKey Staked collateral mint public key
+ * @returns the public key for that staking pool
+ */
 function getPoolPublicKeyForMint(mintPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const strToEncode = mintPublicKey.toString().substring(0, 12);
@@ -61,6 +86,11 @@ function getPoolPublicKeyForMint(mintPublicKey) {
     });
 }
 exports.getPoolPublicKeyForMint = getPoolPublicKeyForMint;
+/**
+ *
+ * @param collateralType String name of the collateral type (must be 16 chars)
+ * @returns The public key for that Vault Type account
+ */
 function getVaultTypeAccountPublicKey(collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
         const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -68,6 +98,11 @@ function getVaultTypeAccountPublicKey(collateralType) {
     });
 }
 exports.getVaultTypeAccountPublicKey = getVaultTypeAccountPublicKey;
+/**
+ *
+ * @param collateralType String name of the collateral type (must be 16 chars)
+ * @returns The public key for that Vault Type oracle info
+ */
 function getVaultTypeOracleAccountPublicKey(collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
         const [vaultTypeOracleAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -75,6 +110,12 @@ function getVaultTypeOracleAccountPublicKey(collateralType) {
     });
 }
 exports.getVaultTypeOracleAccountPublicKey = getVaultTypeOracleAccountPublicKey;
+/**
+ * Vaults are stored in PDA accounts. Use this to get the address from a salt
+ *
+ * @param vaultSalt String salt for the vault (must be 8 chars)
+ * @returns The public key for that Vault Type oracle info
+ */
 function findVaultAddress(vaultSalt) {
     return __awaiter(this, void 0, void 0, function* () {
         const [vaultAddress] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -82,6 +123,12 @@ function findVaultAddress(vaultSalt) {
     });
 }
 exports.findVaultAddress = findVaultAddress;
+/**
+ *
+ * @param walletAddress Owner public key
+ * @param tokenMintAddress Token mint
+ * @returns The associated token account public key
+ */
 function findAssociatedTokenAddress(walletAddress, tokenMintAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield web3_js_1.PublicKey.findProgramAddress([

package/lib/idl/pyth.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IDL = void 0;
+exports.IDL = {
+    "version": "0.1.0",
+    "name": "pyth",
+    "instructions": [
+        {
+            "name": "initialize",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "price",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "price",
+                    "type": "i64"
+                },
+                {
+                    "name": "expo",
+                    "type": "i32"
+                },
+                {
+                    "name": "conf",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "setPrice",
+            "accounts": [
+                {
+                    "name": "price",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "price",
+                    "type": "i64"
+                }
+            ]
+        }
+    ],
+    "accounts": [
+        {
+            "name": "priceWrapper",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "price",
+                        "type": {
+                            "defined": "Price"
+                        }
+                    }
+                ]
+            }
+        }
+    ],
+    "errors": [
+        {
+            "code": 6000,
+            "name": "InvalidTradingStatus",
+            "msg": "invalid trading status"
+        }
+    ]
+};

package/lib/idl/vault.js

@@ -1757,6 +1757,47 @@ exports.IDL = {
                 }
             ],
             "args": []
+        },
+        {
+            "name": "adminResetVault",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultAssociatedTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultTypeAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultTypeAssociatedTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "amountToSendFromVaultType",
+                    "type": "u64"
+                }
+            ]
         }
     ],
     "accounts": [
@@ -2561,9 +2602,6 @@ exports.IDL = {
                     },
                     {
                         "name": "Distributed"
-                    },
-                    {
-                        "name": "Redeemed"
                     }
                 ]
             }

package/lib/instructions/depositVault.js

@@ -38,7 +38,7 @@ 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);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(depositAmount), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
         if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,

package/lib/instructions/liquidateVault.js

@@ -35,7 +35,7 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         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 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, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, true);
         const history = web3_js_1.Keypair.generate();
         const newEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();

package/lib/instructions/loanVault.js

@@ -27,7 +27,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         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 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, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(loanAmount), new anchor_1.BN(0), 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, new anchor_1.BN(loanAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/redeemVault.js

@@ -30,7 +30,7 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, 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, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(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, new anchor_1.BN(redeemAmount), transactionOverrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/refreshOraclePrice.js

@@ -29,6 +29,7 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
         const enc = new TextEncoder();
         const [oracleInfoAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
         const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
+        const oracleInfo = yield program.account.oracleInfoForCollateralType.fetch(oracleInfoAccount);
         return yield program.methods
             .refreshOraclePrice(new anchor_1.BN(overridePrice !== null && overridePrice !== void 0 ? overridePrice : web3_js_1.LAMPORTS_PER_SOL * 150), // override usd/sol price
         new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000) - 1) // override override time
@@ -36,9 +37,9 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
             .accounts({
             oracleInfoAccount: oracleInfoAccount,
             vaultTypeAccount: vaultTypeAccount,
-            oracleChainlink: chainlinkAccounts[network],
-            oraclePyth: pythAccounts[network],
-            oracleSwitchboard: switchboardAccounts[network],
+            oracleChainlink: oracleInfo.oracleChainlink,
+            oraclePyth: oracleInfo.oraclePyth,
+            oracleSwitchboard: oracleInfo.oracleSwitchboard,
             systemProgram: web3_js_1.SystemProgram.programId,
             chainlinkProgram: Constants_1.CHAINLINK_PROGRAM_ID,
         })
@@ -59,12 +60,12 @@ const pythAccounts = {
 };
 const chainlinkAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
-    Devnet: new web3_js_1.PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
+    Devnet: new web3_js_1.PublicKey('HgTtcbcmp5BeThax5AU8vg4VwK79qAvAKKFMs8txMLW6'),
     MainnetBeta: web3_js_1.SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET
 };
 const switchboardAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     // Devnet: new PublicKey('GvDMxPzN1sCj7L26YDK2HnMRXEQmQ2aemov8YBtPS7vR'),
-    Devnet: new web3_js_1.PublicKey('DpoK8Zz69APV9ntjuY9C4LZCxANYMV56M2cbXEdkjxME'),
+    Devnet: new web3_js_1.PublicKey('GvDMxPzN1sCj7L26YDK2HnMRXEQmQ2aemov8YBtPS7vR'),
     MainnetBeta: web3_js_1.SystemProgram.programId, // Switchboard V2 NOT ON MAINNET YET
 };

package/lib/instructions/repayVault.js

@@ -28,7 +28,7 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const vaultTypeAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultAccount.vaultType, 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, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(Math.abs(repayAmount)), 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, new anchor_1.BN(repayAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/withdrawVault.js

@@ -34,7 +34,7 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         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 [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(Math.abs(withdrawAmount)), new anchor_1.BN(0), new anchor_1.BN(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, new anchor_1.BN(withdrawAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;