hedge-web3 0.2.25 → 0.2.26

package/declarations/state/VaultAccount.d.ts

@@ -3,6 +3,19 @@ import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import BN from 'bn.js';
 import VaultType from './VaultType';
+export declare 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.
  */
@@ -28,10 +41,10 @@ export declare class VaultAccount {
     /** Current State of the vault ("Open", "Closed", "Liquidated") */
     vaultStatus: string;
     /** 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);
     /**
      * Check if some `PublicKey` is the owner
      *

package/lib/instructions/createVault.js

@@ -73,7 +73,7 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
         const salt = (0, uuid_1.v4)().substring(0, 8);
         const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(program.programId, salt);
         const history = web3_js_1.Keypair.generate();
-        const { blockhash } = yield program.provider.connection.getLatestBlockhash();
+        const { blockhash, lastValidBlockHeight } = yield program.provider.connection.getLatestBlockhash();
         const transaction = new web3_js_1.Transaction({
             feePayer: payerPublicKey,
             recentBlockhash: blockhash,

package/lib/state/VaultAccount.js

@@ -32,7 +32,7 @@ const bn_js_1 = __importDefault(require("bn.js"));
  * A class that represents an on-chian vault.
  */
 class VaultAccount {
-    constructor(vault, publicKey) {
+    constructor(vaultData, publicKey) {
         /** The deposited collateral of the vault (in SOL Lamports). */
         this.deposited = new bn_js_1.default(0);
         /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
@@ -46,25 +46,25 @@ class VaultAccount {
         /** Current State of the vault ("Open", "Closed", "Liquidated") */
         this.vaultStatus = '';
         this.publicKey = publicKey;
-        this.vaultOwner = vault.vaultOwner;
-        this.pdaSalt = vault.pdaSalt;
-        this.deposited = vault.deposited;
-        this.denormalizedDebt = vault.denormalizedDebt;
-        if (vault.vaultNumber) {
-            this.vaultNumber = vault.vaultNumber.toNumber();
+        this.vaultOwner = vaultData.vaultOwner;
+        this.pdaSalt = vaultData.pdaSalt;
+        this.deposited = vaultData.deposited;
+        this.denormalizedDebt = vaultData.denormalizedDebt;
+        if (vaultData.vaultNumber) {
+            this.vaultNumber = vaultData.vaultNumber.toNumber();
         }
-        if (vault.debtProductSnapshotBytes) {
-            this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
+        if (vaultData.debtProductSnapshotBytes) {
+            this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vaultData.debtProductSnapshotBytes.toString());
         }
-        if (vault.collateralAccumulatorSnapshotBytes) {
-            this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
+        if (vaultData.collateralAccumulatorSnapshotBytes) {
+            this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vaultData.collateralAccumulatorSnapshotBytes.toString());
         }
-        this.vaultTypeName = vault.vaultTypeName;
-        this.nextVaultToRedeem = vault.nextVaultToRedeem;
-        if (vault.vaultStatus) {
-            this.vaultStatus = Object.keys(vault.vaultStatus)[0];
+        this.vaultTypeName = vaultData.vaultTypeName;
+        this.nextVaultToRedeem = vaultData.nextVaultToRedeem;
+        if (vaultData.vaultStatus) {
+            this.vaultStatus = Object.keys(vaultData.vaultStatus)[0];
         }
-        this.vaultType = vault.vaultType;
+        this.vaultType = vaultData.vaultType;
     }
     /**
      * Check if some `PublicKey` is the owner

package/lib/utils/getLinkedListAccounts.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const anchor_1 = require("@project-serum/anchor");
+const web3_js_1 = require("@solana/web3.js");
 const underscore_1 = __importDefault(require("underscore"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const VaultAccount_1 = require("../state/VaultAccount");
@@ -42,7 +43,23 @@ function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKe
         let oldSmallerPublicKey = vaultPublicKey;
         let newSmallerPublicKey = vaultPublicKey;
         let newLargerPublicKey = vaultPublicKey;
-        const thisVaultData = yield program.account.vault.fetch(vaultPublicKey);
+        const thisVaultData = yield program.account.vault.fetch(vaultPublicKey)
+            .catch((e) => {
+            console.log('Error fetching vault account. Assuming it does not exist yet');
+            return {
+                vaultOwner: new web3_js_1.PublicKey('11111111111111111111111111111111'),
+                pdaSalt: 'foo',
+                deposited: new anchor_1.BN(0),
+                denormalizedDebt: new anchor_1.BN(0),
+                vaultNumber: new anchor_1.BN(0),
+                debtProductSnapshotBytes: new anchor_1.BN(0),
+                collateralAccumulatorSnapshotBytes: new anchor_1.BN(0),
+                vaultTypeName: vaultType.name,
+                nextVaultToRedeem: new web3_js_1.PublicKey('11111111111111111111111111111111'),
+                vaultStatus: { open: true },
+                vaultType: vaultTypeAccountPublicKey
+            };
+        });
         // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
         const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
         // Load all the vaults

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/instructions/createVault.ts

@@ -3,16 +3,21 @@ import { TokenInstructions } from '@project-serum/serum'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey, Signer,
+  PublicKey,
+  Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction
+  TransactionInstruction,
 } from '@solana/web3.js'
 import {
   findAssociatedTokenAddress,
-  findVaultAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
-  getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
+  findVaultAddress,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getVaultTypeAccountPublicKey,
 } from '../Constants'
 
 import { v4 as uuidv4 } from 'uuid'
@@ -129,7 +134,7 @@ export async function buildCreateVaultTransaction(
   const salt = uuidv4().substring(0, 8)
   const newVaultPublicKey = await findVaultAddress(program.programId, salt)
   const history = Keypair.generate() as Signer
-  const { blockhash } = await program.provider.connection.getLatestBlockhash()
+  const { blockhash, lastValidBlockHeight } = await program.provider.connection.getLatestBlockhash()
   const transaction = new Transaction({
     feePayer: payerPublicKey,
     recentBlockhash: blockhash,

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

@@ -46,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)