hedge-web3 0.1.21 → 0.1.26

package/src/instructions/redeemVault.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 // import { TokenInstructions } from '@project-serum/serum'
 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 redeemVault (
   program: Program,
@@ -12,10 +12,10 @@ export async function redeemVault (
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  // Prep the user to get USH back out at some point
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
@@ -31,7 +31,7 @@ export async function redeemVault (
     await redeemVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       payerTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
@@ -49,7 +49,7 @@ export async function redeemVault (
 export async function redeemVaultInstruction (
   program: Program,
   payerPublicKey: PublicKey,
-  payerUsdhAccount: PublicKey,
+  payerUshAccount: PublicKey,
   destinationTokenAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
@@ -60,12 +60,12 @@ export async function redeemVaultInstruction (
   transactionOverrideTime?: 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.redeemVault(
     new BN(redeemAmount),
@@ -79,10 +79,10 @@ export async function redeemVaultInstruction (
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMintPublickey,
+        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMintPublickey,
         payer: payerPublicKey,
-        payerUsdhAccount: payerUsdhAccount,
+        payerUshAccount: payerUshAccount,
         destinationTokenAccount: destinationTokenAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId

package/src/instructions/refreshOraclePrice.ts

@@ -36,7 +36,7 @@ export async function refreshOraclePriceInstruction (
 
   return program.instruction.refreshOraclePrice(
     new BN(overridePrice ?? LAMPORTS_PER_SOL * 150), // override usd/sol price
-    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
+    new BN(overrideTime ?? Math.floor(Date.now() / 1000)-1), // override override time
     {
       accounts: {
         oracleInfoAccount: oracleInfoAccount,

package/src/instructions/repayVault.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 repayVault (
   program: Program,
@@ -11,10 +11,10 @@ export async function repayVault (
   repayAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  // Prep the user to get USH back out at some point
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
@@ -27,7 +27,7 @@ export async function repayVault (
     await repayVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
@@ -44,7 +44,7 @@ export async function repayVault (
 export async function repayVaultInstruction (
   program: Program,
   payerPublicKey: PublicKey,
-  ownerUsdhAccount: PublicKey,
+  ownerUshAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
@@ -54,12 +54,12 @@ export async function repayVaultInstruction (
   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.repayVault(
@@ -74,10 +74,10 @@ export async function repayVaultInstruction (
         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
       },

package/src/instructions/setHalted.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { TokenInstructions } from '@project-serum/serum'
 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 { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'

package/src/instructions/withdrawStakingPool.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 { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function withdrawStakingPool (
   program: Program,
@@ -34,18 +34,18 @@ export async function withdrawStakingPoolInstruction (
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
   const [poolPublickey] = await getPoolPublicKeyForMint(stakedTokenMintPublicKey)
   const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, stakedTokenMintPublicKey)
-  const poolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(poolPublickey, usdhMintPublickey)
+  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
   const payerAssociatedStakedTokenAccount = await findAssociatedTokenAddress(payerPublicKey, stakedTokenMintPublicKey)
   const payerAssociatedHedgeAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
-  const payerAssociatedUsdhAccount = await findAssociatedTokenAddress(payerPublicKey, usdhMintPublickey)
+  const payerAssociatedUshAccount = await findAssociatedTokenAddress(payerPublicKey, ushMintPublickey)
   const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
 
   return program.instruction.withdrawStakingPool(
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         payer: payerPublicKey,
@@ -53,14 +53,14 @@ export async function withdrawStakingPoolInstruction (
         pool: poolPublickey,
         poolPosition: poolPositionPublicKey,
         poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-        poolAssociatedUsdhTokenAccount: poolAssociatedUsdhTokenAccount,
+        poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
         payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
         payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-        payerAssociatedUsdhAccount: payerAssociatedUsdhAccount,
+        payerAssociatedUshAccount: payerAssociatedUshAccount,
         communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
         hedgeMint: hedgeMintPublickey,
         stakedTokenMint: stakedTokenMintPublicKey,
-        usdhMint: usdhMintPublickey,
+        ushMint: ushMintPublickey,
         rent: SYSVAR_RENT_PUBKEY,
         tokenProgram: TOKEN_PROGRAM_ID,
         associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/withdrawVault.ts

@@ -2,7 +2,7 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { TokenInstructions } from '@project-serum/serum'
 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 withdrawVault (
   program: Program,
@@ -12,10 +12,10 @@ export async function withdrawVault (
   withdrawAmount: 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 history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -28,9 +28,9 @@ export async function withdrawVault (
 
   const destinationTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey)
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   )
 
   const transaction = new Transaction().add(
@@ -44,8 +44,8 @@ export async function withdrawVault (
       vaultTypeAccount,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
-      hedgeStakingPoolAssociatedUsdhTokenAccount,
-      usdhMintPublickey,
+      hedgeStakingPoolAssociatedUshTokenAccount,
+      ushMintPublickey,
       history.publicKey,
       withdrawAmount,
       overrideTime
@@ -65,8 +65,8 @@ export async function withdrawVaultInstruction (
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
   hedgeStakingPoolPublicKey: PublicKey,
-  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
-  usdhMint: PublicKey,
+  hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
+  ushMint: PublicKey,
   historyPublicKey: PublicKey,
   withdrawAmount: number,
   overrideTime?: number
@@ -82,8 +82,8 @@ export async function withdrawVaultInstruction (
         vault: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMint,
+        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMint,
         history: historyPublicKey,
         vaultOwner: payerPublicKey,
         destinationTokenAccount: destinationTokenAccount,

package/src/state/LiquidationPosition.ts

@@ -11,7 +11,7 @@ export class LiquidationPosition {
 
   public ownerAccount: PublicKey
   public deposit: number
-  public closedUsdh: number
+  public closedUsh: number
   public timestampOpened: Date
   public timestampClosed: Date
 
@@ -27,7 +27,7 @@ export class LiquidationPosition {
     this.eraPublicKey = poolPositionInfo.era
     this.ownerAccount = poolPositionInfo.ownerAccount
     this.deposit = poolPositionInfo.deposit.toNumber()
-    this.closedUsdh = poolPositionInfo.closedUsdh.toNumber()
+    this.closedUsh = poolPositionInfo.closedUsh.toNumber()
     this.timestampOpened = poolPositionInfo.timestampOpened.toNumber()
     this.timestampClosed = poolPositionInfo.timestampClosed.toNumber()
 
@@ -40,7 +40,7 @@ export class LiquidationPosition {
     console.log("poolPositionInfo.state, poolPositionInfo.state")
   }
 
-  public getUsdhAvailable (era: LiquidationPoolEra): Decimal {
+  public getUshAvailable (era: LiquidationPoolEra): Decimal {
     return (era.product.div(this.productSnapshotEntry)).mul(new Decimal(this.deposit))
   }
 

package/src/state/StakingPool.ts

@@ -12,8 +12,8 @@ export class StakingPool {
   totalHedgeReward: number
 
   hedgeRewardAccumulator: Decimal
-  usdhFeeAccumulator: Decimal
-  solFeeAccumulator: Decimal
+  ushFeeAccumulator: Decimal
+  collateralFeeAccumulator: [Decimal]
 
   constructor (public poolInfo: any, publicKey: PublicKey) {
     this.publicKey = publicKey
@@ -26,8 +26,8 @@ export class StakingPool {
     this.totalHedgeReward = poolInfo.totalHedgeReward.toNumber()
 
     this.hedgeRewardAccumulator = DecimalFromU128(poolInfo.hedgeRewardAccumulator)
-    this.usdhFeeAccumulator = DecimalFromU128(poolInfo.usdhFeeAccumulator)
-    this.solFeeAccumulator = DecimalFromU128(poolInfo.solFeeAccumulator)
+    this.ushFeeAccumulator = DecimalFromU128(poolInfo.ushFeeAccumulator)
+    this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum: any) => { return DecimalFromU128(sum) })
     // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
   }
 

package/src/state/StakingPoolPosition.ts

@@ -13,7 +13,7 @@ export class StakingPoolPosition {
   public timestampClosed: number
   public closedRewardedTokens: number
   public startHedgeRewardAccumulator: Decimal
-  public startUsdhFeeAccumulator: Decimal
+  public startUshFeeAccumulator: Decimal
   public startSolFeeAccumulator: Decimal
   public open: boolean
 
@@ -27,13 +27,13 @@ export class StakingPoolPosition {
     this.closedRewardedTokens = poolPositionInfo.closedRewardedTokens.toNumber()
 
     this.startHedgeRewardAccumulator = DecimalFromU128(poolPositionInfo.startHedgeRewardAccumulator)
-    this.startUsdhFeeAccumulator = DecimalFromU128(poolPositionInfo.startUsdhFeeAccumulator)
+    this.startUshFeeAccumulator = DecimalFromU128(poolPositionInfo.startUshFeeAccumulator)
     this.startSolFeeAccumulator = DecimalFromU128(poolPositionInfo.startSolFeeAccumulator)
 
     this.open = poolPositionInfo.state.open !== undefined
   }
 
-  public getCurrentUsdhFeeReward (): Decimal {
-    return this.pool.usdhFeeAccumulator.minus(this.startUsdhFeeAccumulator).times(new Decimal(this.deposited))
+  public getCurrentUshFeeReward (): Decimal {
+    return this.pool.ushFeeAccumulator.minus(this.startUshFeeAccumulator).times(new Decimal(this.deposited))
   }
 }

package/src/state/VaultAccount.ts

@@ -18,7 +18,7 @@ export class VaultAccount {
   /** The deposited collateral of the vault (in SOL Lamports). */
   deposited: number
 
-  /** The outstanding debt of the vault (in USDH Lamports). Denormalized to time 0. */
+  /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
   denormalizedDebt: number
 
   debtProductSnapshotBytes: Decimal
@@ -64,9 +64,9 @@ export class VaultAccount {
   }
 
   /**
-   * Get the debt value in USDH
+   * Get the debt value in USH
    *
-   * @returns debt value in USDH
+   * @returns debt value in USH
    */
   public inUsd (): number {
     return this.denormalizedDebt / LAMPORTS_PER_SOL

package/src/state/VaultHistoryEvent.ts

@@ -7,10 +7,10 @@ export class VaultHistoryEvent {
   publicKey: PublicKey
   actorAccount: PublicKey
   usdSolPrice: Decimal
-  usdhDebtBefore: number
-  usdhDebtAfter: number
-  solBalanceBefore: number
-  solBalanceAfter: number
+  ushDebtBefore: number
+  ushDebtAfter: number
+  collateralBalanceBefore: number
+  collateralBalanceAfter: number
   minCollateralRatioBefore: Decimal
   minCollateralRatioAfter: Decimal
   vaultStateBefore: PublicKey
@@ -24,10 +24,10 @@ export class VaultHistoryEvent {
 
     this.usdSolPrice = DecimalFromU128(account.usdSolPrice.toString())
 
-    this.usdhDebtBefore = account.usdhDebtBefore.toNumber()
-    this.usdhDebtAfter = account.usdhDebtAfter.toNumber()
-    this.solBalanceBefore = account.solBalanceBefore.toNumber()
-    this.solBalanceAfter = account.solBalanceAfter.toNumber()
+    this.ushDebtBefore = account.ushDebtBefore.toNumber()
+    this.ushDebtAfter = account.ushDebtAfter.toNumber()
+    this.collateralBalanceBefore = account.collateralBalanceBefore.toNumber()
+    this.collateralBalanceAfter = account.collateralBalanceAfter.toNumber()
     this.minCollateralRatioBefore = DecimalFromU128(account.minCollateralRatioBefore)
     this.minCollateralRatioAfter = DecimalFromU128(account.minCollateralRatioAfter)
     this.vaultStateBefore = account.vaultStateBefore