hedge-web3 0.2.24 → 0.2.26

package/src/state/VaultAccount.ts

@@ -6,6 +6,20 @@ import * as borsh from '@project-serum/borsh'
 import BN from 'bn.js'
 import VaultType from './VaultType'
 
+export type VaultAccountData = {
+  vaultOwner: PublicKey
+  pdaSalt: string
+  deposited: BN
+  denormalizedDebt: BN
+  vaultNumber: BN
+  debtProductSnapshotBytes: BN
+  collateralAccumulatorSnapshotBytes: BN
+  vaultTypeName: string
+  nextVaultToRedeem: PublicKey | null
+  vaultStatus: any
+  vaultType: PublicKey
+}
+
 /**
  * A class that represents an on-chian vault.
  */
@@ -41,35 +55,35 @@ export class VaultAccount {
   vaultStatus = ''
 
   /** The public key of the next vault to redeem. */
-  nextVaultToRedeem: PublicKey
+  nextVaultToRedeem: PublicKey | null
 
   /** The public key of the vault type. */
   vaultType: PublicKey
 
-  constructor(vault: any, publicKey: PublicKey) {
+  constructor(vaultData: VaultAccountData, publicKey: PublicKey) {
     this.publicKey = publicKey
-    this.vaultOwner = vault.vaultOwner
-    this.pdaSalt = vault.pdaSalt
+    this.vaultOwner = vaultData.vaultOwner
+    this.pdaSalt = vaultData.pdaSalt
 
-    this.deposited = vault.deposited
-    this.denormalizedDebt = vault.denormalizedDebt
+    this.deposited = vaultData.deposited
+    this.denormalizedDebt = vaultData.denormalizedDebt
 
-    if (vault.vaultNumber) {
-      this.vaultNumber = vault.vaultNumber.toNumber()
+    if (vaultData.vaultNumber) {
+      this.vaultNumber = vaultData.vaultNumber.toNumber()
     }
-    if (vault.debtProductSnapshotBytes) {
-      this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
+    if (vaultData.debtProductSnapshotBytes) {
+      this.debtProductSnapshotBytes = DecimalFromU128(vaultData.debtProductSnapshotBytes.toString())
     }
-    if (vault.collateralAccumulatorSnapshotBytes) {
-      this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vault.collateralAccumulatorSnapshotBytes.toString())
+    if (vaultData.collateralAccumulatorSnapshotBytes) {
+      this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vaultData.collateralAccumulatorSnapshotBytes.toString())
     }
-    this.vaultTypeName = vault.vaultTypeName
-    this.nextVaultToRedeem = vault.nextVaultToRedeem
+    this.vaultTypeName = vaultData.vaultTypeName
+    this.nextVaultToRedeem = vaultData.nextVaultToRedeem
 
-    if (vault.vaultStatus) {
-      this.vaultStatus = Object.keys(vault.vaultStatus)[0]
+    if (vaultData.vaultStatus) {
+      this.vaultStatus = Object.keys(vaultData.vaultStatus)[0]
     }
-    this.vaultType = vault.vaultType
+    this.vaultType = vaultData.vaultType
   }
 
   /**

package/src/utils/getLinkedListAccounts.ts

@@ -1,14 +1,11 @@
-import { Program, Provider, BN } from '@project-serum/anchor'
-import { PublicKey, Signer } from '@solana/web3.js'
+import { BN, Program } from '@project-serum/anchor'
+import { PublicKey } from '@solana/web3.js'
 import _ from 'underscore'
-import { getVaultSystemStatePublicKey, getVaultTypeOracleAccountPublicKey, HEDGE_PROGRAM_PUBLICKEY } from '../Constants'
 
-import { DecimalFromU128 } from '../HedgeDecimal'
-import { VaultAccount } from '../state/VaultAccount'
 import Decimal from 'decimal.js'
 import { Vault } from '../idl/vault'
+import { VaultAccount } from '../state/VaultAccount'
 
-import * as borsh from '@project-serum/borsh'
 import base58 from 'bs58'
 import VaultType from '../state/VaultType'
 
@@ -49,6 +46,22 @@ export async function getLinkedListAccounts(
   let newLargerPublicKey = vaultPublicKey
 
   const thisVaultData = await program.account.vault.fetch(vaultPublicKey)
+  .catch((e) => {
+    console.log('Error fetching vault account. Assuming it does not exist yet')
+    return {
+      vaultOwner: new PublicKey('11111111111111111111111111111111'),
+      pdaSalt: 'foo',
+      deposited: new BN(0),
+      denormalizedDebt: new BN(0),
+      vaultNumber: new BN(0),
+      debtProductSnapshotBytes: new BN(0),
+      collateralAccumulatorSnapshotBytes: new BN(0),
+      vaultTypeName: vaultType.name,
+      nextVaultToRedeem: new PublicKey('11111111111111111111111111111111'),
+      vaultStatus: {open: true},
+      vaultType: vaultTypeAccountPublicKey
+    }
+  })
   // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
   const thisVault = new VaultAccount(thisVaultData, vaultPublicKey)
 
@@ -228,7 +241,7 @@ async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: Public
       },
     },
   ]
-  const allAccounts = await program.provider.connection.getProgramAccounts(HEDGE_PROGRAM_PUBLICKEY, {
+  const allAccounts = await program.provider.connection.getProgramAccounts(program.programId, {
     filters: filters,
     // Slice the data only to grab the 3 u64's of size 8 bytes each
     dataSlice: {