hedge-web3 0.1.28 → 0.1.32

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