hedge-web3 0.1.21 → 0.1.26

package/src/index.ts

@@ -2,6 +2,7 @@
 export * from './instructions/createStakingPool'
 export * from './instructions/depositStakingPool'
 export * from './instructions/withdrawStakingPool'
+export * from './instructions/claimStakingPoolPosition'
 export * from './instructions/depositLiquidationPool'
 export * from './instructions/closeLiquidationPoolPosition'
 export * from './instructions/claimLiquidationPoolPosition'

package/src/instructions/claimStakingPoolPosition.ts

@@ -0,0 +1,76 @@
+import { 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, findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
+
+export async function claimStakingPoolPosition(
+  program: Program,
+  provider: Provider,
+  poolPosition: PublicKey,
+  payer: Signer,
+  collateralType: string,
+): Promise<PublicKey> {
+  const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
+  const collateralMint = vaultTypeAccountInfo.collateralMint
+  const stakedTokenMint = await getHedgeMintPublicKey()
+  const [feePool] = await getPoolPublicKeyForMint(stakedTokenMint)
+  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, feePool, true)
+  const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    payer.publicKey
+  )
+
+  const transaction = new Transaction().add(
+    await claimStakingPoolPositionInstruction(
+      program,
+      feePool,
+      feePoolAssociatedTokenAccount.address,
+      stakedTokenMint,
+      vaultTypeAccount,
+      collateralMint,
+      poolPosition,
+      payer.publicKey,
+      payerAssociatedTokenAccount.address
+    )
+  )
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  return payerAssociatedTokenAccount.address
+}
+
+export async function claimStakingPoolPositionInstruction(
+  program: Program,
+  feePool: PublicKey,
+  feePoolAssociatedTokenAccount: PublicKey,
+  stakedTokenMint: PublicKey,
+  vaultTypeAccount: PublicKey,
+  collateralMint: PublicKey,
+  poolPosition: PublicKey,
+  payer: PublicKey,
+  payerAssociatedTokenAccount: PublicKey
+): Promise<TransactionInstruction> {
+  const vaultSystemState = await getVaultSystemStatePublicKey()
+
+  return program.instruction.claimStakingPoolPosition(
+    {
+      accounts: {
+        vaultSystemState: vaultSystemState,
+        feePool: feePool,
+        stakedTokenMint: stakedTokenMint,
+        feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
+        vaultTypeAccount: vaultTypeAccount,
+        collateralMint: collateralMint,
+        poolPosition: poolPosition,
+        payer: payer,
+        payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+        systemProgram: SystemProgram.programId,
+        tokenProgram: TOKEN_PROGRAM_ID,
+        rent: SYSVAR_RENT_PUBKEY
+      },
+      signers: []
+    })
+}

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,31 +42,31 @@ 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(
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
         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,26 +35,26 @@ export async function createStakingPoolInstruction (
 ): Promise<TransactionInstruction> {
   console.log("createStakingPoolInstruction program ID", program.programId.toString())
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const [poolPublickey, poolBump, poolSeedPhrase] = 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 ?? Date.now() / 1000),
+    new BN(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: 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
     )
@@ -241,8 +241,9 @@ export async function buildCreateVaultTransaction(
         owner: payerPublicKey,
       })
     );
+    transaction.partialSign(wrappedSolAccount)
   }
-  transaction.partialSign(wrappedSolAccount)
+  
   transaction.partialSign(history)
   console.log("transaction", transaction)
 
@@ -257,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> {
@@ -278,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,24 +40,24 @@ 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()
 
   return program.instruction.depositLiquidationPool(
     new BN(depositAmount),
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         vaultSystemState: vaultSystemState,
         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/depositStakingPool.ts

@@ -42,7 +42,7 @@ export async function depositStakingPoolInstruction (
 
   return program.instruction.depositStakingPool(
     new BN(depositAmount),
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         payer: payerPublicKey,

package/src/instructions/depositVault.ts

@@ -2,7 +2,7 @@ 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 { findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
 
 export async function depositVault(
   program: Program,
@@ -12,10 +12,10 @@ 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)
@@ -31,9 +31,9 @@ export async function depositVault(
   const wrappedSolAccount = Keypair.generate()
 
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   )
 
   const transaction = new Transaction()
@@ -68,9 +68,9 @@ export async function depositVault(
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
-      hedgeStakingPoolAssociatedUsdhTokenAccount,
+      hedgeStakingPoolAssociatedUshTokenAccount,
       vaultTypeAccountInfo.collateralMint,
-      usdhMintPublickey,
+      ushMintPublickey,
       depositAmount,
       overrideTime
     )
@@ -100,9 +100,9 @@ export async function depositVaultInstruction(
   vaultTypeAccountPublicKey: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
   hedgeStakingPoolPublicKey: PublicKey,
-  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
+  hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
-  usdhMintPublickey: PublicKey,
+  ushMintPublickey: PublicKey,
   depositAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -118,11 +118,11 @@ export async function depositVaultInstruction(
         vault: vaultPublicKey,
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
+        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
         history: historyPublicKey,
         vaultOwner: vaultOwner,
         vaultOwnerTokenAccount: vaultOwnerTokenAccount,
-        usdhMint: usdhMintPublickey,
+        ushMint: ushMintPublickey,
         systemProgram: SystemProgram.programId,
         tokenProgram: TOKEN_PROGRAM_ID
       },

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,

package/src/instructions/liquidateVault.ts

@@ -1,7 +1,7 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function liquidateVault (
   program: Program,
@@ -17,7 +17,7 @@ export async function liquidateVault (
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
   const poolStateInfo = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
@@ -27,7 +27,7 @@ export async function liquidateVault (
   const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, vaultPublicKey, true)
   const poolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, liquidationPoolStatePublicKey, true)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, vaultTypeAccountPublicKey, true)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, hedgeStakingPoolPublicKey, true)
+  const hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, hedgeStakingPoolPublicKey, true)
 
   const history = Keypair.generate()
   const newEra = Keypair.generate()
@@ -47,7 +47,7 @@ export async function liquidateVault (
       newEra.publicKey,
       hedgeStakingPoolPublicKey,
       feePoolAssociatedTokenAccount.address,
-      hedgeStakingPoolAssociatedUsdhTokenAccount.address,
+      hedgeStakingPoolAssociatedUshTokenAccount.address,
       collateralMint,
       vaultTypeAssociatedTokenAccount.address,
       vaultAccount.collateralType,
@@ -71,15 +71,15 @@ export async function liquidateVaultInstruction (
   newEraPublicKey: PublicKey,
   feePool: PublicKey,
   feePoolAssociatedTokenAccount: PublicKey,
-  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
+  hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
   collateralType: string,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const liquidationPoolUsdhAccountPublickey = await getLiquidationPoolUsdhAccountPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
+  const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
   const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
   const payload = {
@@ -93,14 +93,14 @@ export async function liquidateVaultInstruction (
       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,
       tokenProgram: TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId,

package/src/instructions/loanVault.ts

@@ -1,7 +1,7 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function loanVault (
   program: Program,
@@ -11,9 +11,9 @@ export async function loanVault (
   loanAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
@@ -26,7 +26,7 @@ export async function loanVault (
     await loanVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
@@ -43,7 +43,7 @@ export async function loanVault (
 export async function loanVaultInstruction (
   program: Program,
   payerPublicKey: PublicKey,
-  ownerUsdhAccount: PublicKey,
+  ownerUshAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
@@ -53,12 +53,12 @@ export async function loanVaultInstruction (
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   )
 
   return program.instruction.loanVault(
@@ -73,10 +73,10 @@ export async function loanVaultInstruction (
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMintPublickey,
+        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMintPublickey,
         vaultOwner: payerPublicKey,
-        ownerUsdhAccount: ownerUsdhAccount,
+        ownerUshAccount: ownerUshAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId
       },