hedge-web3 0.1.25 → 0.1.28

package/lib/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./instructions/refreshOraclePrice"), exports);
 __exportStar(require("./instructions/initHedgeFoundation"), exports);
 __exportStar(require("./instructions/initHedgeFoundationTokens"), exports);
 __exportStar(require("./instructions/setHalted"), exports);
+__exportStar(require("./instructions/setVaultTypeStatus"), exports);
 __exportStar(require("./HedgeDecimal"), exports);
 __exportStar(require("./Constants"), exports);
 __exportStar(require("./state/VaultAccount"), exports);
@@ -37,3 +38,4 @@ __exportStar(require("./state/StakingPoolPosition"), exports);
 __exportStar(require("./state/LiquidationPoolEra"), exports);
 __exportStar(require("./state/LiquidationPoolState"), exports);
 __exportStar(require("./state/LiquidationPosition"), exports);
+__exportStar(require("./utils/getLinkedListAccounts"), exports);

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -17,26 +17,26 @@ const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
 function closeLiquidationPoolPosition(program, provider, poolPosition, payer, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
         const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
         const payerAssociatedHedgeAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, payer.publicKey);
         const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true);
-        const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUsdhAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUshAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
         return poolPosition;
     });
 }
 exports.closeLiquidationPoolPosition = closeLiquidationPoolPosition;
-function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payerPublicKey, payerUsdhAccount, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, overrideStartTime) {
+function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payerPublicKey, payerUshAccount, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const usdhMint = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const poolUsdhAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
+        const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
         const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
         return program.instruction.closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
         {
@@ -45,11 +45,11 @@ function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition,
                 poolState: poolState,
                 poolEra: poolEra,
                 poolPosition: poolPosition,
-                poolUsdhAccount: poolUsdhAccount,
+                poolUshAccount: poolUshAccount,
                 payer: payerPublicKey,
-                ownerUsdhAccount: payerUsdhAccount,
+                ownerUshAccount: payerUshAccount,
                 hedgeMint: hedgeMint,
-                usdhMint: usdhMint,
+                ushMint: ushMint,
                 payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
                 communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
                 associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,

package/lib/instructions/createStakingPool.js

@@ -28,19 +28,19 @@ function createStakingPoolInstruction(program, payerPublicKey, mintPublicKey, he
     return __awaiter(this, void 0, void 0, function* () {
         console.log("createStakingPoolInstruction program ID", program.programId.toString());
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        const [poolPublickey, poolBump, poolSeedPhrase] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
         const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, mintPublicKey);
-        const poolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, usdhMintPublickey);
-        return program.instruction.createStakingPool(poolBump, poolSeedPhrase, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), {
+        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, ushMintPublickey);
+        return program.instruction.createStakingPool(poolBump, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), {
             accounts: {
                 signer: payerPublicKey,
                 vaultSystemState: vaultSystemStatePublicKey,
                 pool: poolPublickey,
                 stakedTokenMintInfo: mintPublicKey,
-                usdhMint: usdhMintPublickey,
+                ushMint: ushMintPublickey,
                 poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-                poolAssociatedUsdhTokenAccount: poolAssociatedUsdhTokenAccount,
+                poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,

package/lib/instructions/createVault.js

@@ -19,12 +19,12 @@ const uuid_1 = require("uuid");
 const Errors_1 = require("../utils/Errors");
 function createVault(program, provider, payer, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const salt = (0, uuid_1.v4)().substring(0, 8);
         const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(salt);
         const history = web3_js_1.Keypair.generate();
-        // Prep the user to get USDH back out at some point
-        yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        // Prep the user to get USH back out at some point
+        yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payer.publicKey, vaultTypeAccountInfo.collateralMint);
@@ -35,7 +35,7 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
         const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() ===
             serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const feePoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         if (isWrappedSol) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
@@ -50,7 +50,7 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUsdhTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, usdhMintPublickey, depositAmount, overrideTime));
+        transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, depositAmount, overrideTime));
         if (isWrappedSol) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
@@ -66,7 +66,7 @@ exports.createVault = createVault;
 function buildCreateVaultTransaction(program, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log("HEDGE SDK: buildCreateVaultTransaction");
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const payerPublicKey = program.provider.wallet.publicKey;
         const salt = (0, uuid_1.v4)().substring(0, 8);
         const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(salt);
@@ -89,7 +89,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
         const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, vaultTypeAccountInfo.collateralMint);
         const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const feePoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         console.log('about to start building transaction');
         // If wrapped SOL collateral, we convert the SOL to wSOL to use in the instruction
         if (isWrappedSol) {
@@ -107,7 +107,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
             signers.push(wrappedSolAccount);
         }
         console.log("hedgeStakingPoolPublicKey", hedgeStakingPoolPublicKey.toString());
-        transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUsdhTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, usdhMintPublickey, depositAmount, overrideTime));
+        transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, depositAmount, overrideTime));
         if (isWrappedSol) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
@@ -122,7 +122,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
     });
 }
 exports.buildCreateVaultTransaction = buildCreateVaultTransaction;
-function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccountPublicKey, vaultPublicKey, vaultAssociatedTokenAccount, feePool, feePoolAssociatedUsdhTokenAccount, vaultTypeAccount, collateralMint, historyPublicKey, usdhMintPublickey, depositAmount, overrideTime) {
+function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccountPublicKey, vaultPublicKey, vaultAssociatedTokenAccount, feePool, feePoolAssociatedUshTokenAccount, vaultTypeAccount, collateralMint, historyPublicKey, ushMintPublickey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ix = program.instruction.createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
@@ -133,12 +133,12 @@ function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccount
                 vault: vaultPublicKey,
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 feePool: feePool,
-                feePoolAssociatedUsdhTokenAccount: feePoolAssociatedUsdhTokenAccount,
+                feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
                 history: historyPublicKey,
                 payer: payerPublicKey,
                 payerTokenAccount: payerTokenAccountPublicKey,
                 collateralMint: collateralMint,
-                usdhMint: usdhMintPublickey,
+                ushMint: ushMintPublickey,
                 systemProgram: web3_js_1.SystemProgram.programId,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,

package/lib/instructions/depositLiquidationPool.js

@@ -17,21 +17,21 @@ const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
 function depositLiquidationPool(program, provider, payer, depositAmount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const poolPosition = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, payerUsdhAccount.address, poolPosition.publicKey, depositAmount, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, payerUshAccount.address, poolPosition.publicKey, depositAmount, overrideStartTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolPosition], provider.opts).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
 exports.depositLiquidationPool = depositLiquidationPool;
-function depositLiquidationPoolInstruction(program, payerPublicKey, payerUsdhAccount, poolPositionPublicKey, depositAmount, overrideStartTime) {
+function depositLiquidationPoolInstruction(program, payerPublicKey, payerUshAccount, poolPositionPublicKey, depositAmount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
         const liquidationPoolState = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
-        const poolUSDHAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
-        const usdhMint = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const poolUSHAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
+        const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         return program.instruction.depositLiquidationPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
         {
@@ -40,10 +40,10 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, payerUsdhAcc
                 poolState: liquidationPoolStatePublicKey,
                 poolEra: liquidationPoolState.currentEra,
                 poolPosition: poolPositionPublicKey,
-                poolUsdhAccount: poolUSDHAccount,
-                usdhMint: usdhMint,
+                poolUshAccount: poolUSHAccount,
+                ushMint: ushMint,
                 payer: payerPublicKey,
-                ownerUsdhAccount: payerUsdhAccount,
+                ownerUshAccount: payerUshAccount,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 systemProgram: web3_js_1.SystemProgram.programId,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY

package/lib/instructions/depositVault.js

@@ -14,12 +14,13 @@ const anchor_1 = require("@project-serum/anchor");
 const serum_1 = require("@project-serum/serum");
 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 depositVault(program, provider, payer, vaultPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        // Prep the user to get USDH back out at some point
-        yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        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 vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(vaultAccount.collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
@@ -30,29 +31,32 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const wrappedSolAccount = web3_js_1.Keypair.generate();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        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, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, 0, false, false);
         if (vaultAccount.collateralType === 'SOL') {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
                 lamports: depositAmount + 2.04e6,
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
-                space: 165
+                space: 165,
             }), serum_1.TokenInstructions.initializeAccount({
                 account: wrappedSolAccount.publicKey,
                 mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey
+                owner: payer.publicKey,
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount, vaultTypeAccountInfo.collateralMint, usdhMintPublickey, depositAmount, overrideTime));
+        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,
-                owner: payer.publicKey
+                owner: payer.publicKey,
             }));
         }
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, signers, provider.opts);
@@ -60,7 +64,7 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
     });
 }
 exports.depositVault = depositVault;
-function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount, collateralMint, usdhMintPublickey, depositAmount, overrideTime) {
+function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return program.instruction.depositVault(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
         {
@@ -72,15 +76,18 @@ function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner,
                 vault: vaultPublicKey,
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
+                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
                 history: historyPublicKey,
                 vaultOwner: vaultOwner,
                 vaultOwnerTokenAccount: vaultOwnerTokenAccount,
-                usdhMint: usdhMintPublickey,
+                ushMint: ushMintPublickey,
+                oldSmallerVaultInfo: oldSmallerPublicKey,
+                newSmallerVaultInfo: newSmallerPublicKey,
+                newLargerVaultInfo: newLargerPublicKey,
                 systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
-            signers: []
+            signers: [],
         });
     });
 }

package/lib/instructions/initHedgeFoundation.js

@@ -27,8 +27,8 @@ function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKe
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const poolStatePublickey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        const poolUsdhTokenAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const poolUshTokenAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
@@ -37,9 +37,9 @@ function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKe
                 vaultSystemState: vaultSystemStatePublicKey,
                 poolState: poolStatePublickey,
                 poolEra: poolEraPublicKey,
-                poolUsdhAccount: poolUsdhTokenAccount,
+                poolUshAccount: poolUshTokenAccount,
                 founder: payerPublicKey,
-                usdhMint: usdhMintPublickey,
+                ushMint: ushMintPublickey,
                 hedgeMint: hedgeMintPublickey,
                 founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
                 communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,

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* () {
@@ -21,7 +22,7 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
         const poolStateInfo = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
@@ -30,21 +31,22 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         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, vaultTypeAccountPublicKey, true);
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, hedgeStakingPoolPublicKey, 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, hedgeStakingPoolAssociatedUsdhTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, vaultAccount.collateralType, 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], provider.opts);
         return vaultPublicKey;
     });
 }
 exports.liquidateVault = liquidateVault;
-function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, poolState, poolEra, poolAssociatedTokenAccount, historyPublicKey, newEraPublicKey, feePool, feePoolAssociatedTokenAccount, hedgeStakingPoolAssociatedUsdhTokenAccount, 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 usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        const liquidationPoolUsdhAccountPublickey = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
+        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: {
@@ -57,21 +59,24 @@ function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedToken
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 poolState: poolState,
                 poolAssociatedTokenAccount: poolAssociatedTokenAccount,
-                usdhMint: usdhMintPublickey,
+                ushMint: ushMintPublickey,
                 history: historyPublicKey,
                 payer: payerPublicKey,
                 payerAssociatedTokenAccount: payerAssociatedTokenAccount,
                 feePool: feePool,
                 feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-                liquidationPoolUsdhAccount: liquidationPoolUsdhAccountPublickey,
+                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
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
             },
-            signers: []
+            signers: [],
         };
         return program.instruction.liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
         payload);

package/lib/instructions/loanVault.js

@@ -13,30 +13,32 @@ 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* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        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 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, 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, payerUsdhAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, loanAmount, overrideTime));
+        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], provider.opts);
         return vaultPublicKey;
     });
 }
 exports.loanVault = loanVault;
-function loanVaultInstruction(program, payerPublicKey, ownerUsdhAccount, 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 usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        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: {
@@ -47,14 +49,17 @@ function loanVaultInstruction(program, payerPublicKey, ownerUsdhAccount, vaultPu
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 history: historyPublicKey,
                 feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-                usdhMint: usdhMintPublickey,
+                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+                ushMint: ushMintPublickey,
                 vaultOwner: payerPublicKey,
-                ownerUsdhAccount: ownerUsdhAccount,
+                ownerUshAccount: ownerUshAccount,
+                oldSmallerVaultInfo: oldSmallerPublicKey,
+                newSmallerVaultInfo: newSmallerPublicKey,
+                newLargerVaultInfo: newLargerPublicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
-            signers: []
+            signers: [],
         });
     });
 }

package/lib/instructions/redeemVault.js

@@ -14,32 +14,34 @@ 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* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        // Prep the user to get USDH back out at some point
-        const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        // 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 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, 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, payerUsdhAccount.address, payerTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, 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], provider.opts);
         return vaultPublicKey;
     });
 }
 exports.redeemVault = redeemVault;
-function redeemVaultInstruction(program, payerPublicKey, payerUsdhAccount, 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 usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        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: {
@@ -50,11 +52,14 @@ function redeemVaultInstruction(program, payerPublicKey, payerUsdhAccount, desti
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 history: historyPublicKey,
                 feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-                usdhMint: usdhMintPublickey,
+                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+                ushMint: ushMintPublickey,
                 payer: payerPublicKey,
-                payerUsdhAccount: payerUsdhAccount,
+                payerUshAccount: payerUshAccount,
                 destinationTokenAccount: destinationTokenAccount,
+                oldSmallerVaultInfo: oldSmallerPublicKey,
+                newSmallerVaultInfo: newSmallerPublicKey,
+                newLargerVaultInfo: newLargerPublicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 systemProgram: web3_js_1.SystemProgram.programId
             },

package/lib/instructions/repayVault.js

@@ -13,31 +13,33 @@ 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* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        // Prep the user to get USDH back out at some point
-        const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        // 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 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, 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, payerUsdhAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, 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], provider.opts);
         return vaultPublicKey;
     });
 }
 exports.repayVault = repayVault;
-function repayVaultInstruction(program, payerPublicKey, ownerUsdhAccount, 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 usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
+        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: {
@@ -48,14 +50,17 @@ function repayVaultInstruction(program, payerPublicKey, ownerUsdhAccount, vaultP
                 vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
                 history: historyPublicKey,
                 feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-                usdhMint: usdhMintPublickey,
+                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+                ushMint: ushMintPublickey,
                 vaultOwner: payerPublicKey,
-                ownerUsdhAccount: ownerUsdhAccount,
+                oldSmallerVaultInfo: oldSmallerPublicKey,
+                newSmallerVaultInfo: newSmallerPublicKey,
+                newLargerVaultInfo: newLargerPublicKey,
+                ownerUshAccount: ownerUshAccount,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
-            signers: []
+            signers: [],
         });
     });
 }