hedge-web3 0.1.29 → 0.1.33

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
 

package/src/utils/getLinkedListAccounts.ts

@@ -1,27 +1,24 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { PublicKey, Signer } from '@solana/web3.js'
 import _ from 'underscore'
-import {
-  getVaultSystemStatePublicKey,
-  getVaultTypeOracleAccountPublicKey,
-} from '../Constants'
+import { getVaultSystemStatePublicKey, getVaultTypeOracleAccountPublicKey } from '../Constants'
 
 import { DecimalFromU128 } from '../HedgeDecimal'
 import { VaultAccount } from '../state/VaultAccount'
 import Decimal from 'decimal.js'
+import { Vault } from 'idl/vault'
 export async function getLinkedListAccounts(
-  program: Program,
+  program: Program<Vault>,
   provider: Provider,
   vaultTypeAccountPublicKey: PublicKey,
   vaultPublicKey: PublicKey,
   depositAmount: number,
   loanAmount: number,
   redeem: boolean,
-  liquidate: boolean
-): Promise<[PublicKey, PublicKey, PublicKey]> {
-  const vaultTypeAccount = await program.account.vaultType.fetch(
-    vaultTypeAccountPublicKey
-  )
+  liquidate: boolean,
+  cachedVaults?: VaultAccount[]
+): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]> {
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
 
   // Default for null is the vault itself, so set them all to this vault
   let oldSmallerPublicKey = vaultPublicKey
@@ -32,21 +29,27 @@ export async function getLinkedListAccounts(
   const thisVault = new VaultAccount(thisVaultData, vaultPublicKey)
 
   // Load all the vaults
-  let allVaults =
-    (await program.account.vault
-      .all([
-        // {
-        //   memcmp: { bytes: bs58.encode(inputCollateralType), offset: 8 + 32 + 8 },
-        // },
-      ])
-      .catch((error) => {
-        console.log('error', error)
-      })) || []
-
-  // Load them into our account objects
-  let vaults = allVaults.map((vault) => {
-    return new VaultAccount(vault.account, vault.publicKey)
-  })
+  let vaults
+  if (cachedVaults) {
+    vaults = cachedVaults
+  } else {
+    let allVaults = cachedVaults
+      ? cachedVaults
+      : (await program.account.vault
+          .all([
+            // {
+            //   memcmp: { bytes: bs58.encode(inputCollateralType), offset: 8 + 32 + 8 },
+            // },
+          ])
+          .catch((error) => {
+            console.log('error', error)
+          })) || []
+
+    // Load them into our account objects
+    vaults = allVaults.map((vault) => {
+      return new VaultAccount(vault.account, vault.publicKey)
+    })
+  }
 
   // Filter out the account that are not the same vault type
   vaults = _.filter(vaults, (vault) => {
@@ -89,9 +92,8 @@ export async function getLinkedListAccounts(
   // Now that we know it's def in the list, iterate the list and update
   // this vault with the opeation we're going to apply
   const newNormalizedDebt = new Decimal(loanAmount)
-  const vaultTypeCompoundedInterest = DecimalFromU128(
-    vaultTypeAccount.cumulativeRate.toString()
-  )
+  const vaultTypeCompoundedInterest = DecimalFromU128(vaultTypeAccount.cumulativeRate.toString())
+  vaults[indexBefore].updateDebtAndCollateral(vaultTypeAccount)
   vaults[indexBefore].addDebt(newNormalizedDebt, vaultTypeCompoundedInterest)
   vaults[indexBefore].addDeposit(depositAmount)
 
@@ -101,7 +103,6 @@ export async function getLinkedListAccounts(
   if (redeem) {
     vaults[indexBefore].redeem()
   }
-  vaults[indexBefore].redistribution(vaultTypeAccount)
 
   if (vaults[indexBefore].denormalizedDebt === 0) {
     vaults.splice(indexBefore, 1)
@@ -141,7 +142,7 @@ export async function getLinkedListAccounts(
   // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
   // console.log('newLargerPublicKey', newLargerPublicKey.toString())
 
-  return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey]
+  return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults]
 }
 
 // Sort function we can use to sort the vaults

package/tsconfig.json

@@ -18,4 +18,4 @@
     "outDir": "./lib",
   },
   "include": ["src"]
-}
+}