hedge-web3 0.1.28 → 0.1.32

package/src/instructions/setHalted.ts

@@ -1,48 +1,56 @@
 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, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import {
+  findAssociatedTokenAddress,
+  findVaultAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
 
-import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
+import { Vault } from 'idl/vault'
 
-export async function setHalted (
-  program: Program,
+export async function setHalted(
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   halted: boolean
 ): Promise<PublicKey> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
 
-
   const transaction = new Transaction().add(
-    await setHaltedInstruction(
-      program,
-      vaultSystemStatePublicKey,
-      payer.publicKey,
-      halted
-    )
+    await setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider?.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return vaultSystemStatePublicKey
 }
 
-export async function setHaltedInstruction (
-  program: Program,
+export async function setHaltedInstruction(
+  program: Program<Vault>,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   halted: boolean
 ): Promise<TransactionInstruction> {
-  const ix = program.instruction.setHalted(
-    halted,
-    {
-      accounts: {
-        payer: payerPublicKey,
-        vaultSystemState: vaultSystemStatePublicKey,
-      },
-      signers: []
+  return await program.methods
+    .setHalted(halted)
+    .accounts({
+      payer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
     })
-  return ix
+    .instruction()
 }

package/src/instructions/setVaultTypeStatus.ts

@@ -1,12 +1,30 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import {
+  findAssociatedTokenAddress,
+  findVaultAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
+import { Vault } from 'idl/vault'
 
-export async function setVaultTypeStatus (
-  program: Program,
+export async function setVaultTypeStatus(
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   vaultTypeAccount: PublicKey,
@@ -14,37 +32,27 @@ export async function setVaultTypeStatus (
 ): Promise<PublicKey> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
 
-
   const transaction = new Transaction().add(
-    await setVaultTypeStatusInstruction(
-      program,
-      vaultSystemStatePublicKey,
-      payer.publicKey,
-      vaultTypeAccount,
-      deprecated,
-    )
+    await setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, deprecated)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider?.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return vaultSystemStatePublicKey
 }
 
 export async function setVaultTypeStatusInstruction(
-  program: Program,
+  program: Program<Vault>,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   deprecated: boolean
 ): Promise<TransactionInstruction> {
-  const ix = program.instruction.setVaultTypeStatus(
-    deprecated,
-    {
-      accounts: {
-        payer: payerPublicKey,
-        vaultSystemState: vaultSystemStatePublicKey,
-        vaultType: vaultTypeAccount,
-      },
-      signers: []
+  return await program.methods
+    .setVaultTypeStatus(deprecated)
+    .accounts({
+      payer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      vaultType: vaultTypeAccount,
     })
-  return ix
+    .instruction()
 }

package/src/instructions/withdrawStakingPool.ts

@@ -1,11 +1,27 @@
 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 {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
-export async function withdrawStakingPool (
-  program: Program,
+export async function withdrawStakingPool(
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   poolPositionPublicKey: PublicKey,
@@ -22,12 +38,12 @@ export async function withdrawStakingPool (
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 
-export async function withdrawStakingPoolInstruction (
-  program: Program,
+export async function withdrawStakingPoolInstruction(
+  program: Program<Vault>,
   payerPublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
@@ -44,28 +60,26 @@ export async function withdrawStakingPoolInstruction (
   const payerAssociatedUshAccount = await findAssociatedTokenAddress(payerPublicKey, ushMintPublickey)
   const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
 
-  return program.instruction.withdrawStakingPool(
-    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
-    {
-      accounts: {
-        payer: payerPublicKey,
-        vaultSystemState: vaultSystemStatePublicKey,
-        pool: poolPublickey,
-        poolPosition: poolPositionPublicKey,
-        poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-        poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
-        payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
-        payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-        payerAssociatedUshAccount: payerAssociatedUshAccount,
-        communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-        hedgeMint: hedgeMintPublickey,
-        stakedTokenMint: stakedTokenMintPublicKey,
-        ushMint: ushMintPublickey,
-        rent: SYSVAR_RENT_PUBKEY,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
-      },
-      signers: []
+  return await program.methods
+    .withdrawStakingPool(
+      new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
+    )
+    .accounts({
+      payer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      pool: poolPublickey,
+      poolPosition: poolPositionPublicKey,
+      poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+      poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
+      payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
+      payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
+      payerAssociatedUshAccount: payerAssociatedUshAccount,
+      communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
+      hedgeMint: hedgeMintPublickey,
+      stakedTokenMint: stakedTokenMintPublicKey,
+      ushMint: ushMintPublickey,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
     })
+    .instruction()
 }

package/src/instructions/withdrawVault.ts

@@ -1,8 +1,5 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import {
-  getOrCreateAssociatedTokenAccount,
-  TOKEN_PROGRAM_ID,
-} from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { TokenInstructions } from '@project-serum/serum'
 import {
   Keypair,
@@ -22,9 +19,10 @@ import {
   getHedgeMintPublicKey,
 } from '../Constants'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import { Vault } from 'idl/vault'
 
 export async function withdrawVault(
-  program: Program,
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
@@ -34,39 +32,28 @@ export async function withdrawVault(
   const ushMintPublickey = await getUshMintPublicKey()
 
   // Prep the user to get USH back out at some point
-  await getOrCreateAssociatedTokenAccount(
-    provider.connection,
-    payer,
-    ushMintPublickey,
-    payer.publicKey
-  )
+  await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
-    vaultAccount.collateralType
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    TokenInstructions.WRAPPED_SOL_MINT,
+    vaultPublicKey,
+    true
   )
-  const vaultAssociatedCollateralAccount =
-    await getOrCreateAssociatedTokenAccount(
-      provider.connection,
-      payer,
-      TokenInstructions.WRAPPED_SOL_MINT,
-      vaultPublicKey,
-      true
-    )
 
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(
-    vaultTypeAccountPublicKey
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    vaultTypeAccountInfo.collateralMint,
+    vaultTypeAccountPublicKey,
+    true
   )
-  const vaultTypeAssociatedTokenAccount =
-    await getOrCreateAssociatedTokenAccount(
-      provider.connection,
-      payer,
-      vaultTypeAccountInfo.collateralMint,
-      vaultTypeAccountPublicKey,
-      true
-    )
 
   const destinationTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -74,26 +61,22 @@ export async function withdrawVault(
     vaultTypeAccountInfo.collateralMint,
     payer.publicKey
   )
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
-    await getHedgeMintPublicKey()
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    hedgeStakingPoolPublicKey,
+    ushMintPublickey
   )
-  const hedgeStakingPoolAssociatedUshTokenAccount =
-    await findAssociatedTokenAddress(
-      hedgeStakingPoolPublicKey,
-      ushMintPublickey
-    )
 
-  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
-    await getLinkedListAccounts(
-      program,
-      provider,
-      vaultTypeAccountPublicKey,
-      vaultPublicKey,
-      withdrawAmount * -1,
-      0,
-      false,
-      false
-    )
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
+    program,
+    provider,
+    vaultTypeAccountPublicKey,
+    vaultPublicKey,
+    withdrawAmount * -1,
+    0,
+    false,
+    false
+  )
 
   const transaction = new Transaction().add(
     await withdrawVaultInstruction(
@@ -116,17 +99,12 @@ export async function withdrawVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(
-    provider.connection,
-    transaction,
-    [payer, history],
-    provider.opts
-  )
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 
 export async function withdrawVaultInstruction(
-  program: Program,
+  program: Program<Vault>,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   destinationTokenAccount: PublicKey,
@@ -144,30 +122,28 @@ export async function withdrawVaultInstruction(
   withdrawAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  return program.instruction.withdrawVault(
-    new BN(withdrawAmount),
-    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
-    {
-      accounts: {
-        vaultSystemState: vaultSystemStatePublicKey,
-        vaultTypeAccount: vaultTypeAccount,
-        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-        vault: vaultPublickey,
-        vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
-        feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUshTokenAccount:
-          hedgeStakingPoolAssociatedUshTokenAccount,
-        ushMint: ushMint,
-        history: historyPublicKey,
-        vaultOwner: payerPublicKey,
-        destinationTokenAccount: destinationTokenAccount,
-        oldSmallerVaultInfo: oldSmallerPublicKey,
-        newSmallerVaultInfo: newSmallerPublicKey,
-        newLargerVaultInfo: newLargerPublicKey,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId,
-      },
-      signers: [],
-    }
-  )
+  return await program.methods
+    .withdrawVault(
+      new BN(withdrawAmount),
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+    )
+    .accounts({
+      vaultSystemState: vaultSystemStatePublicKey,
+      vaultTypeAccount: vaultTypeAccount,
+      vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+      vault: vaultPublickey,
+      vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
+      feePool: hedgeStakingPoolPublicKey,
+      feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+      ushMint: ushMint,
+      history: historyPublicKey,
+      vaultOwner: payerPublicKey,
+      destinationTokenAccount: destinationTokenAccount,
+      oldSmallerVaultInfo: oldSmallerPublicKey,
+      newSmallerVaultInfo: newSmallerPublicKey,
+      newLargerVaultInfo: newLargerPublicKey,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
+    })
+    .instruction()
 }

package/src/state/LiquidationPoolEra.ts

@@ -1,4 +1,3 @@
-
 import Decimal from 'decimal.js'
 import { DecimalFromU128 } from '../HedgeDecimal'
 
@@ -13,10 +12,12 @@ export class LiquidationPoolEra {
   public hedgeRewardsAccumulator: Decimal
   public hedgeRewardsTimestamp: number
 
-  constructor (public liquidyPoolEra: any) {
+  constructor(public liquidyPoolEra: any) {
     this.totalDeposits = liquidyPoolEra.totalDeposits.toNumber()
     this.product = DecimalFromU128(liquidyPoolEra.productBytes)
-    this.sum = liquidyPoolEra.sumBytes.map((sumBytes: number) => { return DecimalFromU128(sumBytes) })
+    this.sum = liquidyPoolEra.sumBytes.map((sumBytes: number) => {
+      return DecimalFromU128(sumBytes)
+    })
     this.hedgeRewardsAccumulator = DecimalFromU128(liquidyPoolEra.hedgeRewardsAccumulatorBytes)
     this.hedgeRewardsTimestamp = liquidyPoolEra.hedgeRewardsTimestamp.toNumber()
   }

package/src/state/LiquidationPosition.ts

@@ -47,31 +47,4 @@ export class LiquidationPosition {
   public getTokensAvailable (era: LiquidationPoolEra, index: number): Decimal {
     return era.sum[index].minus(this.sumSnapshotsEntry[index]).div(this.productSnapshotEntry).mul(new Decimal(this.deposit)).floor()
   }
-
-  // public getHedgeAvailable (): Decimal {
-  //   const LiquidationPoolTotalSupply = 2000000.0 * LAMPORTS_PER_SOL
-  //   const hedgeRewardsSinceLastUpdate = hedgeRewardsDecay(
-  //     LiquidationPoolTotalSupply,
-  //     this.liquidationPoolState.hedgeInitRewardsTimestamp * 1000,
-  //     this.era.hedgeRewardsTimestamp * 1000,
-  //     Date.now(),
-  //     365 * 1000)
-
-  //   if (this.era.totalDeposits === 0) {
-  //     return new Decimal(0)
-  //   }
-
-  //   const rewardsPerToken = this.era.product.mul(new Decimal(hedgeRewardsSinceLastUpdate / this.era.totalDeposits))
-  //   const newAccumulator = rewardsPerToken.add(new Decimal(this.era.hedgeRewardsAccumulator))
-  //   const hedgeAvailable = (newAccumulator.minus(this.hedgeRewardsSnapshot)).mul(new Decimal(this.deposit)).div(new Decimal(this.productSnapshot))
-  //   return hedgeAvailable
-  // }
 }
-
-// function hedgeRewardsDecay (supply: number, birthTime: number, timeIn: number, timeOut: number, halfLifeInDays: number): number {
-//   const timeInOffsetStart = timeIn - birthTime
-//   const timeOutOffsetStart = timeOut - birthTime
-//   const halfLife = -1 * Math.log(2) / (halfLifeInDays * 60 * 60 * 24)
-//   const awardedTokens = supply * (Math.pow(Math.E, halfLife * timeInOffsetStart) - Math.pow(Math.E, halfLife * timeOutOffsetStart))
-//   return awardedTokens
-// }

package/src/state/StakingPool.ts

@@ -1,4 +1,3 @@
-
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
 import { DecimalFromU128 } from '../HedgeDecimal'
@@ -15,11 +14,9 @@ export class StakingPool {
   ushFeeAccumulator: Decimal
   collateralFeeAccumulator: [Decimal]
 
-  constructor (public poolInfo: any, publicKey: PublicKey) {
+  constructor(public poolInfo: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.deposits = poolInfo.deposits.toNumber()
-    // this.totalFeesNow = poolInfo.totalFeesNow.toNumber()
-    // this.totalFeesPrevious = poolInfo.totalFeesPrevious.toNumber()
     this.lastTransactionTime = poolInfo.lastTransactionTime.toNumber()
     this.startTime = poolInfo.startTime.toNumber()
     this.halfLifeInDays = poolInfo.halfLifeInDays.toNumber()
@@ -27,8 +24,8 @@ export class StakingPool {
 
     this.hedgeRewardAccumulator = DecimalFromU128(poolInfo.hedgeRewardAccumulator)
     this.ushFeeAccumulator = DecimalFromU128(poolInfo.ushFeeAccumulator)
-    this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum: any) => { return DecimalFromU128(sum) })
-    // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
+    this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum: any) => {
+      return DecimalFromU128(sum)
+    })
   }
-
 }

package/src/state/StakingPoolPosition.ts

@@ -1,4 +1,3 @@
-
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
 import { DecimalFromU128 } from '../HedgeDecimal'
@@ -17,7 +16,7 @@ export class StakingPoolPosition {
   public startSolFeeAccumulator: Decimal
   public open: boolean
 
-  constructor (public poolPositionInfo: any, key: PublicKey, stakingPool: StakingPool) {
+  constructor(public poolPositionInfo: any, key: PublicKey, stakingPool: StakingPool) {
     this.publicKey = key
     this.pool = stakingPool
     this.owner = poolPositionInfo.owner
@@ -33,7 +32,7 @@ export class StakingPoolPosition {
     this.open = poolPositionInfo.state.open !== undefined
   }
 
-  public getCurrentUshFeeReward (): Decimal {
+  public getCurrentUshFeeReward(): Decimal {
     return this.pool.ushFeeAccumulator.minus(this.startUshFeeAccumulator).times(new Decimal(this.deposited))
   }
 }

package/src/state/VaultAccount.ts

@@ -40,12 +40,8 @@ export class VaultAccount {
     this.pdaSalt = vault.pdaSalt
     this.deposited = vault.deposited.toNumber()
     this.denormalizedDebt = vault.denormalizedDebt.toNumber()
-    this.debtProductSnapshotBytes = DecimalFromU128(
-      vault.debtProductSnapshotBytes.toString()
-    )
-    this.collateralAccumulatorSnapshotBytes = DecimalFromU128(
-      vault.collateralAccumulatorSnapshotBytes.toString()
-    )
+    this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
+    this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vault.collateralAccumulatorSnapshotBytes.toString())
     this.collateralType = vault.collateralType
 
     this.vaultStatus = Object.keys(vault.vaultStatus)[0]
@@ -90,13 +86,8 @@ export class VaultAccount {
       .substring(this.publicKey.toString().length - 6)}`
   }
 
-  public addDebt(
-    newNormalizedDebt: Decimal,
-    vaultTypeCompoundedInterest: Decimal
-  ) {
-    const denormalizedNewDebt = newNormalizedDebt.div(
-      vaultTypeCompoundedInterest
-    )
+  public addDebt(newNormalizedDebt: Decimal, vaultTypeCompoundedInterest: Decimal) {
+    const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest)
     this.denormalizedDebt += denormalizedNewDebt.toNumber()
   }
   public addDeposit(depositAmount: number) {
@@ -114,14 +105,10 @@ export class VaultAccount {
     this.vaultStatus = 'liquidated'
   }
 
-  public redistribution(vaultTypeAccuntData: any) {
-    const debtProductCurrent = DecimalFromU128(
-      vaultTypeAccuntData.debtRedistributionProduct
-    )
+  public updateDebtAndCollateral(vaultTypeAccuntData: any) {
+    const debtProductCurrent = DecimalFromU128(vaultTypeAccuntData.debtRedistributionProduct)
 
-    const collateralAccumulatorCurrent = DecimalFromU128(
-      vaultTypeAccuntData.collateralRedistributionAccumulator
-    )
+    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccuntData.collateralRedistributionAccumulator)
 
     this.denormalizedDebt = debtProductCurrent
       .div(this.debtProductSnapshotBytes)
@@ -130,10 +117,7 @@ export class VaultAccount {
       .toNumber()
 
     const extraCollateralDeposited =
-      this.denormalizedDebt *
-      collateralAccumulatorCurrent
-        .sub(this.collateralAccumulatorSnapshotBytes)
-        .toNumber()
+      this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
     this.deposited += extraCollateralDeposited
 
     this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent
@@ -151,9 +135,6 @@ export class VaultAccount {
     }
     return `Vault(${this.vaultNumber}): ${this.publicKey
       .toString()
-      .substring(
-        0,
-        6
-      )}. Debt: ${this.inUsd()} Collat: ${collateralRatio} ${arrow}`
+      .substring(0, 6)}. Debt: ${this.inUsd()} Collat: ${collateralRatio} ${arrow}`
   }
 }

package/src/state/VaultHistoryEvent.ts

@@ -1,4 +1,3 @@
-
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
 import { DecimalFromU128 } from '../HedgeDecimal'
@@ -18,7 +17,7 @@ export class VaultHistoryEvent {
   timestamp: PublicKey
   action: VaultHistoryAction
 
-  constructor (public account: any, publicKey: PublicKey) {
+  constructor(public account: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.actorAccount = account.actorAccount