hedge-web3 0.1.27 → 0.1.31

package/lib/instructions/liquidateVault.js

@@ -13,6 +13,7 @@ exports.liquidateVaultInstruction = exports.liquidateVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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");
 function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -31,50 +32,53 @@ 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, 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, 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, vaultAccount.collateralType, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history, newEra], provider.opts);
+        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, collateralType, 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);
-        const payload = {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                collateralMint: collateralMint,
-                poolEra: poolEra,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                poolState: poolState,
-                poolAssociatedTokenAccount: poolAssociatedTokenAccount,
-                ushMint: ushMintPublickey,
-                history: historyPublicKey,
-                payer: payerPublicKey,
-                payerAssociatedTokenAccount: payerAssociatedTokenAccount,
-                feePool: feePool,
-                feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                liquidationPoolUshAccount: liquidationPoolUshAccountPublickey,
-                newEra: newEraPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY
-            },
-            signers: []
-        };
-        return program.instruction.liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        payload);
+        return program.methods
+            .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            collateralMint: collateralMint,
+            poolEra: poolEra,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            poolState: poolState,
+            poolAssociatedTokenAccount: poolAssociatedTokenAccount,
+            ushMint: ushMintPublickey,
+            history: historyPublicKey,
+            payer: payerPublicKey,
+            payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+            feePool: feePool,
+            feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            liquidationPoolUshAccount: liquidationPoolUshAccountPublickey,
+            newEra: newEraPublicKey,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
     });
 }
 exports.liquidateVaultInstruction = liquidateVaultInstruction;

package/lib/instructions/loanVault.js

@@ -13,6 +13,7 @@ exports.loanVaultInstruction = exports.loanVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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");
 function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -23,39 +24,43 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         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, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, loanAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        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;
     });
 }
 exports.loanVault = loanVault;
-function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, loanAmount, overrideTime) {
+function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.loanVault(new anchor_1.BN(loanAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                vaultOwner: payerPublicKey,
-                ownerUshAccount: ownerUshAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return 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
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            vaultOwner: payerPublicKey,
+            ownerUshAccount: ownerUshAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.loanVaultInstruction = loanVaultInstruction;

package/lib/instructions/redeemVault.js

@@ -14,6 +14,7 @@ const anchor_1 = require("@project-serum/anchor");
 const spl_token_1 = require("@solana/spl-token");
 // import { TokenInstructions } from '@project-serum/serum'
 const web3_js_1 = require("@solana/web3.js");
+const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
 function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, transactionOverrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -26,40 +27,44 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         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, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, redeemAmount, transactionOverrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        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;
     });
 }
 exports.redeemVault = redeemVault;
-function redeemVaultInstruction(program, payerPublicKey, payerUshAccount, destinationTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, redeemAmount, transactionOverrideTime) {
+function redeemVaultInstruction(program, payerPublicKey, payerUshAccount, destinationTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, redeemAmount, transactionOverrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.redeemVault(new anchor_1.BN(redeemAmount), new anchor_1.BN(transactionOverrideTime !== null && transactionOverrideTime !== void 0 ? transactionOverrideTime : (Date.now() / 1000)), // override start time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vault: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                payer: payerPublicKey,
-                payerUshAccount: payerUshAccount,
-                destinationTokenAccount: destinationTokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        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
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vault: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            payer: payerPublicKey,
+            payerUshAccount: payerUshAccount,
+            destinationTokenAccount: destinationTokenAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.redeemVaultInstruction = redeemVaultInstruction;

package/lib/instructions/refreshOraclePrice.js

@@ -16,7 +16,7 @@ const Constants_1 = require("../Constants");
 function refreshOraclePrice(program, provider, payer, collateralType, network, overridePrice, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const transaction = new web3_js_1.Transaction().add(yield refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime));
-        return yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts);
+        return yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]);
     });
 }
 exports.refreshOraclePrice = refreshOraclePrice;
@@ -25,19 +25,19 @@ 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);
-        return program.instruction.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
-        {
-            accounts: {
-                oracleInfoAccount: oracleInfoAccount,
-                vaultTypeAccount: vaultTypeAccount,
-                oracleChainlink: chainlinkAccunts[network],
-                oraclePyth: pythAccounts[network],
-                oracleSwitchboard: switchboardAccounts[network],
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        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
+        )
+            .accounts({
+            oracleInfoAccount: oracleInfoAccount,
+            vaultTypeAccount: vaultTypeAccount,
+            oracleChainlink: chainlinkAccunts[network],
+            oraclePyth: pythAccounts[network],
+            oracleSwitchboard: switchboardAccounts[network],
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.refreshOraclePriceInstruction = refreshOraclePriceInstruction;
@@ -50,16 +50,16 @@ var Cluster;
 const pythAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
-    MainnetBeta: new web3_js_1.PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG')
+    MainnetBeta: new web3_js_1.PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'),
 };
 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
+    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'),
-    MainnetBeta: web3_js_1.SystemProgram.programId // Switchboard V2 NOT ON MAINNET YET
+    MainnetBeta: web3_js_1.SystemProgram.programId, // Switchboard V2 NOT ON MAINNET YET
 };

package/lib/instructions/repayVault.js

@@ -13,6 +13,7 @@ exports.repayVaultInstruction = exports.repayVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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");
 function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -24,39 +25,43 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         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, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, repayAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        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;
     });
 }
 exports.repayVault = repayVault;
-function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, repayAmount, overrideTime) {
+function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.repayVault(new anchor_1.BN(repayAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                vaultOwner: payerPublicKey,
-                ownerUshAccount: ownerUshAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        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
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            vaultOwner: payerPublicKey,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            ownerUshAccount: ownerUshAccount,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.repayVaultInstruction = repayVaultInstruction;

package/lib/instructions/setHalted.js

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

package/lib/instructions/setVaultTypeStatus.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setVaultTypeStatusInstruction = exports.setVaultTypeStatus = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
+function setVaultTypeStatus(program, provider, payer, vaultTypeAccount, deprecated) {
+    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);
+        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();
+    });
+}
+exports.setVaultTypeStatusInstruction = setVaultTypeStatusInstruction;

package/lib/instructions/withdrawStakingPool.js

@@ -19,7 +19,7 @@ function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, st
     return __awaiter(this, void 0, void 0, function* () {
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield withdrawStakingPoolInstruction(program, payer.publicKey, poolPositionPublicKey, stakedTokenMintPublicKey, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
@@ -36,29 +36,27 @@ function withdrawStakingPoolInstruction(program, payerPublicKey, poolPositionPub
         const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const payerAssociatedUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, ushMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
-        return program.instruction.withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
-        {
-            accounts: {
-                payer: payerPublicKey,
-                vaultSystemState: vaultSystemStatePublicKey,
-                pool: poolPublickey,
-                poolPosition: poolPositionPublicKey,
-                poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-                poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
-                payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
-                payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-                payerAssociatedUshAccount: payerAssociatedUshAccount,
-                communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-                hedgeMint: hedgeMintPublickey,
-                stakedTokenMint: stakedTokenMintPublicKey,
-                ushMint: ushMintPublickey,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            pool: poolPublickey,
+            poolPosition: poolPositionPublicKey,
+            poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+            poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
+            payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
+            payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
+            payerAssociatedUshAccount: payerAssociatedUshAccount,
+            communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
+            hedgeMint: hedgeMintPublickey,
+            stakedTokenMint: stakedTokenMintPublicKey,
+            ushMint: ushMintPublickey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.withdrawStakingPoolInstruction = withdrawStakingPoolInstruction;

package/lib/instructions/withdrawVault.js

@@ -15,6 +15,7 @@ const spl_token_1 = require("@solana/spl-token");
 const serum_1 = require("@project-serum/serum");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
+const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -23,40 +24,44 @@ 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 vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
+        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(vaultTypeAccount);
-        const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccount, 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 transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultTypeAccount, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, withdrawAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        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;
     });
 }
 exports.withdrawVault = withdrawVault;
-function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMint, historyPublicKey, withdrawAmount, overrideTime) {
+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 program.instruction.withdrawVault(new anchor_1.BN(withdrawAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vault: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMint,
-                history: historyPublicKey,
-                vaultOwner: payerPublicKey,
-                destinationTokenAccount: destinationTokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        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
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vault: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMint,
+            history: historyPublicKey,
+            vaultOwner: payerPublicKey,
+            destinationTokenAccount: destinationTokenAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.withdrawVaultInstruction = withdrawVaultInstruction;