hedge-web3 0.1.25 → 0.1.28

package/src/index.ts

@@ -17,6 +17,7 @@ export * from './instructions/refreshOraclePrice'
 export * from './instructions/initHedgeFoundation'
 export * from './instructions/initHedgeFoundationTokens'
 export * from './instructions/setHalted'
+export * from './instructions/setVaultTypeStatus'
 
 export * from './HedgeDecimal'
 export * from './Constants'
@@ -28,3 +29,5 @@ export * from './state/StakingPoolPosition'
 export * from './state/LiquidationPoolEra'
 export * from './state/LiquidationPoolState'
 export * from './state/LiquidationPosition'
+
+export * from './utils/getLinkedListAccounts'

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function closeLiquidationPoolPosition (
   program: Program,
@@ -11,8 +11,8 @@ export async function closeLiquidationPoolPosition (
   payer: Signer,
   overrideStartTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  const ushMintPublickey = await getUshMintPublicKey()
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const liquidationPositionAccount = await program.account.liquidationPosition.fetch(poolPosition)
   const poolEra = liquidationPositionAccount.era
@@ -27,7 +27,7 @@ export async function closeLiquidationPoolPosition (
       poolEra,
       poolPosition,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       payerAssociatedHedgeAccount.address,
       communityAssociatedHedgeTokenAccount.address,
       overrideStartTime
@@ -42,16 +42,16 @@ export async function closeLiquidationPoolPositionInstruction (
   poolEra: PublicKey,
   poolPosition: PublicKey,
   payerPublicKey: PublicKey,
-  payerUsdhAccount: PublicKey,
+  payerUshAccount: PublicKey,
   payerAssociatedHedgeAccount: PublicKey,
   communityAssociatedHedgeTokenAccount: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
 
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMint = await getUsdhMintPublicKey()
+  const ushMint = await getUshMintPublicKey()
   const hedgeMint = await getHedgeMintPublicKey()
-  const poolUsdhAccount = await getLiquidationPoolUsdhAccountPublicKey()
+  const poolUshAccount = await getLiquidationPoolUshAccountPublicKey()
   const poolState = await getLiquidationPoolStatePublicKey()
 
   return program.instruction.closeLiquidationPoolPosition(
@@ -62,11 +62,11 @@ export async function closeLiquidationPoolPositionInstruction (
         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: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/createStakingPool.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function createStakingPool (
   program: Program,
@@ -35,15 +35,14 @@ export async function createStakingPoolInstruction (
 ): Promise<TransactionInstruction> {
   console.log("createStakingPoolInstruction program ID", program.programId.toString())
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const [poolPublickey, poolBump, poolSeedPhrase] = await getPoolPublicKeyForMint(mintPublicKey)
+  const ushMintPublickey = await getUshMintPublicKey()
+  const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)
 
   const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, mintPublicKey)
-  const poolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(poolPublickey, usdhMintPublickey)
+  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
 
   return program.instruction.createStakingPool(
     poolBump,
-    poolSeedPhrase,
     new BN(hedgeTokensToBeMinted),
     new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)),
     {
@@ -52,9 +51,9 @@ export async function createStakingPoolInstruction (
         vaultSystemState: vaultSystemStatePublicKey,
         pool: poolPublickey,
         stakedTokenMintInfo: mintPublicKey,
-        usdhMint: usdhMintPublickey,
+        ushMint: ushMintPublickey,
         poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-        poolAssociatedUsdhTokenAccount: poolAssociatedUsdhTokenAccount,
+        poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
         rent: SYSVAR_RENT_PUBKEY,
         tokenProgram: TOKEN_PROGRAM_ID,
         associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/createVault.ts

@@ -19,7 +19,7 @@ import {
   findAssociatedTokenAddress,
   findVaultAddress,
   getVaultTypeAccountPublicKey,
-  getUsdhMintPublicKey,
+  getUshMintPublicKey,
   getVaultSystemStatePublicKey,
   getPoolPublicKeyForMint,
   getHedgeMintPublicKey,
@@ -36,17 +36,17 @@ export async function createVault(
   depositAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey();
+  const ushMintPublickey = await getUshMintPublicKey();
 
   const salt = uuidv4().substring(0, 8);
   const newVaultPublicKey = await findVaultAddress(salt);
   const history = Keypair.generate();
 
-  // Prep the user to get USDH back out at some point
+  // Prep the user to get USH back out at some point
   await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
-    usdhMintPublickey,
+    ushMintPublickey,
     payer.publicKey
   );
 
@@ -78,9 +78,9 @@ export async function createVault(
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
     await getHedgeMintPublicKey()
   );
-  const feePoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   );
 
   if (isWrappedSol) {
@@ -109,11 +109,11 @@ export async function createVault(
       newVaultPublicKey,
       vaultAssociatedTokenAccount,
       hedgeStakingPoolPublicKey,
-      feePoolAssociatedUsdhTokenAccount,
+      feePoolAssociatedUshTokenAccount,
       vaultTypeAccountPublicKey,
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
-      usdhMintPublickey,
+      ushMintPublickey,
       depositAmount,
       overrideTime
     )
@@ -145,7 +145,7 @@ export async function buildCreateVaultTransaction(
 ): Promise<[Transaction, Signer[], PublicKey]> {
 
   console.log("HEDGE SDK: buildCreateVaultTransaction")
-  const usdhMintPublickey = await getUsdhMintPublicKey();
+  const ushMintPublickey = await getUshMintPublicKey();
   const payerPublicKey = program.provider.wallet.publicKey;
 
   const salt = uuidv4().substring(0, 8);
@@ -189,9 +189,9 @@ export async function buildCreateVaultTransaction(
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
     await getHedgeMintPublicKey()
   );
-  const feePoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   );
 
   console.log('about to start building transaction')
@@ -224,11 +224,11 @@ export async function buildCreateVaultTransaction(
       newVaultPublicKey,
       vaultAssociatedTokenAccount,
       hedgeStakingPoolPublicKey,
-      feePoolAssociatedUsdhTokenAccount,
+      feePoolAssociatedUshTokenAccount,
       vaultTypeAccountPublicKey,
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
-      usdhMintPublickey,
+      ushMintPublickey,
       depositAmount,
       overrideTime
     )
@@ -258,11 +258,11 @@ export async function createVaultInstruction(
   vaultPublicKey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   feePool: PublicKey,
-  feePoolAssociatedUsdhTokenAccount: PublicKey,
+  feePoolAssociatedUshTokenAccount: PublicKey,
   vaultTypeAccount: PublicKey,
   collateralMint: PublicKey,
   historyPublicKey: PublicKey,
-  usdhMintPublickey: PublicKey,
+  ushMintPublickey: PublicKey,
   depositAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -279,12 +279,12 @@ export async function createVaultInstruction(
         vault: vaultPublicKey,
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         feePool: feePool,
-        feePoolAssociatedUsdhTokenAccount: feePoolAssociatedUsdhTokenAccount,
+        feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
         history: historyPublicKey,
         payer: payerPublicKey,
         payerTokenAccount: payerTokenAccountPublicKey,
         collateralMint: collateralMint,
-        usdhMint: usdhMintPublickey,
+        ushMint: ushMintPublickey,
         systemProgram: SystemProgram.programId,
         tokenProgram: TOKEN_PROGRAM_ID,
         associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/depositLiquidationPool.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function depositLiquidationPool (
   program: Program,
@@ -11,15 +11,15 @@ export async function depositLiquidationPool (
   depositAmount: number,
   overrideStartTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  const ushMintPublickey = await getUshMintPublicKey()
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const poolPosition = Keypair.generate()
   const transaction = new Transaction().add(
     await depositLiquidationPoolInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       poolPosition.publicKey,
       depositAmount,
       overrideStartTime
@@ -32,7 +32,7 @@ export async function depositLiquidationPool (
 export async function depositLiquidationPoolInstruction (
   program: Program,
   payerPublicKey: PublicKey,
-  payerUsdhAccount: PublicKey,
+  payerUshAccount: PublicKey,
   poolPositionPublicKey: PublicKey,
   depositAmount: number,
   overrideStartTime?: number
@@ -40,8 +40,8 @@ export async function depositLiquidationPoolInstruction (
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
   const liquidationPoolState = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
 
-  const poolUSDHAccount = await getLiquidationPoolUsdhAccountPublicKey()
-  const usdhMint = await getUsdhMintPublicKey()
+  const poolUSHAccount = await getLiquidationPoolUshAccountPublicKey()
+  const ushMint = await getUshMintPublicKey()
 
   const vaultSystemState = await getVaultSystemStatePublicKey()
 
@@ -54,10 +54,10 @@ export async function depositLiquidationPoolInstruction (
         poolState: liquidationPoolStatePublicKey,
         poolEra: liquidationPoolState.currentEra,
         poolPosition: poolPositionPublicKey,
-        poolUsdhAccount: poolUSDHAccount,
-        usdhMint: usdhMint,
+        poolUshAccount: poolUSHAccount,
+        ushMint: ushMint,
         payer: payerPublicKey,
-        ownerUsdhAccount: payerUsdhAccount,
+        ownerUshAccount: payerUshAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId,
         rent: SYSVAR_RENT_PUBKEY

package/src/instructions/depositVault.ts

@@ -1,8 +1,27 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { TokenInstructions } from '@project-serum/serum'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import {
+  getOrCreateAssociatedTokenAccount,
+  TOKEN_PROGRAM_ID,
+} from '@solana/spl-token'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  findAssociatedTokenAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
 
 export async function depositVault(
   program: Program,
@@ -12,33 +31,71 @@ export async function depositVault(
   depositAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  // Prep the user to get USDH back out at some point
-  await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  // Prep the user to get USH back out at some point
+  await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
-  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
+    vaultAccount.collateralType
+  )
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(
+    vaultTypeAccountPublicKey
+  )
+  const vaultTypeAssociatedTokenAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      vaultTypeAccountInfo.collateralMint,
+      vaultTypeAccountPublicKey,
+      true
+    )
 
-  const payerTokenAccount = await findAssociatedTokenAddress(payer.publicKey, vaultTypeAccountInfo.collateralMint)
-  const vaultAssociatedCollateralAccountPublicKey = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccountInfo.collateralMint)
+  const payerTokenAccount = await findAssociatedTokenAddress(
+    payer.publicKey,
+    vaultTypeAccountInfo.collateralMint
+  )
+  const vaultAssociatedCollateralAccountPublicKey =
+    await findAssociatedTokenAddress(
+      vaultPublicKey,
+      vaultTypeAccountInfo.collateralMint
+    )
 
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
 
   const wrappedSolAccount = Keypair.generate()
 
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    await getHedgeMintPublicKey()
   )
+  const hedgeStakingPoolAssociatedUshTokenAccount =
+    await findAssociatedTokenAddress(
+      hedgeStakingPoolPublicKey,
+      ushMintPublickey
+    )
 
   const transaction = new Transaction()
   const signers = [payer, history]
 
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      depositAmount,
+      0,
+      false,
+      false
+    )
+
   if (vaultAccount.collateralType === 'SOL') {
     transaction.add(
       SystemProgram.createAccount({
@@ -46,12 +103,12 @@ export async function depositVault(
         lamports: depositAmount + 2.04e6,
         newAccountPubkey: wrappedSolAccount.publicKey,
         programId: TOKEN_PROGRAM_ID,
-        space: 165
+        space: 165,
       }),
       TokenInstructions.initializeAccount({
         account: wrappedSolAccount.publicKey,
         mint: TokenInstructions.WRAPPED_SOL_MINT,
-        owner: payer.publicKey
+        owner: payer.publicKey,
       })
     )
     signers.push(wrappedSolAccount)
@@ -61,16 +118,21 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount,
+      vaultAccount.collateralType === 'SOL'
+        ? wrappedSolAccount.publicKey
+        : payerTokenAccount,
       vaultPublicKey,
       vaultAssociatedCollateralAccountPublicKey,
       history.publicKey,
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
-      hedgeStakingPoolAssociatedUsdhTokenAccount,
+      hedgeStakingPoolAssociatedUshTokenAccount,
       vaultTypeAccountInfo.collateralMint,
-      usdhMintPublickey,
+      ushMintPublickey,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       depositAmount,
       overrideTime
     )
@@ -80,12 +142,17 @@ export async function depositVault(
       TokenInstructions.closeAccount({
         source: wrappedSolAccount.publicKey,
         destination: payer.publicKey,
-        owner: payer.publicKey
+        owner: payer.publicKey,
       })
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers, provider.opts)
+  await sendAndConfirmTransaction(
+    provider.connection,
+    transaction,
+    signers,
+    provider.opts
+  )
   return vaultPublicKey
 }
 
@@ -100,9 +167,12 @@ export async function depositVaultInstruction(
   vaultTypeAccountPublicKey: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
   hedgeStakingPoolPublicKey: PublicKey,
-  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
+  hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
-  usdhMintPublickey: PublicKey,
+  ushMintPublickey: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   depositAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -118,14 +188,19 @@ export async function depositVaultInstruction(
         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: SystemProgram.programId,
-        tokenProgram: TOKEN_PROGRAM_ID
+        tokenProgram: TOKEN_PROGRAM_ID,
       },
-      signers: []
-    })
+      signers: [],
+    }
+  )
 }

package/src/instructions/initHedgeFoundation.ts

@@ -2,7 +2,7 @@ import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function initHedgeFoundation(
   program: Program,
@@ -30,8 +30,8 @@ export async function initHedgeFoundationInstruction (
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const poolStatePublickey = await getLiquidationPoolStatePublicKey()
-  const poolUsdhTokenAccount = await getLiquidationPoolUsdhAccountPublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const poolUshTokenAccount = await getLiquidationPoolUshAccountPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
   const founderHedgeTokenAccount = await findAssociatedTokenAddress(
     payerPublicKey,
@@ -48,9 +48,9 @@ export async function initHedgeFoundationInstruction (
         vaultSystemState: vaultSystemStatePublicKey,
         poolState: poolStatePublickey,
         poolEra: poolEraPublicKey,
-        poolUsdhAccount: poolUsdhTokenAccount,
+        poolUshAccount: poolUshTokenAccount,
         founder: payerPublicKey,
-        usdhMint: usdhMintPublickey,
+        ushMint: ushMintPublickey,
         hedgeMint: hedgeMintPublickey,
         founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
         communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,

package/src/instructions/initHedgeFoundationTokens.ts

@@ -2,7 +2,7 @@ import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function initHedgeFoundationTokens(
   program: Program,