hedge-web3 0.1.46 → 0.1.50

package/src/instructions/loanVault.ts

@@ -17,13 +17,8 @@ import {
   getVaultTypeAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
-  HEDGE_PROGRAM_PUBLICKEY,
 } from '../Constants'
 import { Vault } from 'idl/vault'
-import { parseAnchorErrors } from '../utils/Errors'
-import { VaultAccount } from '../state/VaultAccount'
-
-const fs = require('fs');
 
 export async function loanVault(
   program: Program<Vault>,
@@ -41,14 +36,15 @@ export async function loanVault(
     ushMintPublickey,
     payer.publicKey
   )
-  const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
 
+  const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccount.collateralMint,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     true
   )
   const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -58,10 +54,11 @@ export async function loanVault(
     vaultPublicKey,
     true
   )
+
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     0,
     loanAmount,
@@ -78,7 +75,7 @@ export async function loanVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultAccount.vaultType,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -87,7 +84,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/redeemVault.ts

@@ -40,12 +40,13 @@ export async function redeemVault(
   )
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     true
   )
 
@@ -67,7 +68,7 @@ export async function redeemVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     0,
     0,
@@ -85,7 +86,7 @@ export async function redeemVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultAccount.vaultType,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,

package/src/instructions/refreshOraclePrice.ts

@@ -51,7 +51,7 @@ export async function refreshOraclePriceInstruction(
     .accounts({
       oracleInfoAccount: oracleInfoAccount,
       vaultTypeAccount: vaultTypeAccount,
-      oracleChainlink: chainlinkAccounts[network],
+      oracleChainlink: chainlinkAccunts[network],
       oraclePyth: pythAccounts[network],
       oracleSwitchboard: switchboardAccounts[network],
       systemProgram: SystemProgram.programId,
@@ -70,7 +70,7 @@ const pythAccounts = {
   Devnet: new PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
   MainnetBeta: new PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'),
 }
-const chainlinkAccounts = {
+const chainlinkAccunts = {
   Testing: SystemProgram.programId,
   Devnet: new PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
   MainnetBeta: SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET

package/src/instructions/repayVault.ts

@@ -39,9 +39,10 @@ export async function repayVault(
   )
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultTypeAccount.collateralMint
   )
   const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccount.collateralMint)
@@ -49,7 +50,7 @@ export async function repayVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     0,
     repayAmount * -1,
@@ -66,7 +67,7 @@ export async function repayVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
-      vaultAccount.vaultType,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount,
       oldSmallerPublicKey,
       newSmallerPublicKey,

package/src/instructions/withdrawVault.ts

@@ -37,6 +37,7 @@ export async function withdrawVault(
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
   const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -45,12 +46,12 @@ export async function withdrawVault(
     true
   )
 
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     true
   )
 
@@ -69,7 +70,7 @@ export async function withdrawVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     withdrawAmount * -1,
     0,
@@ -85,7 +86,7 @@ export async function withdrawVault(
       destinationTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedCollateralAccount.address,
-      vaultAccount.vaultType,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,

package/src/state/VaultAccount.ts

@@ -18,10 +18,10 @@ export class VaultAccount {
   pdaSalt: string
 
   /** The deposited collateral of the vault (in SOL Lamports). */
-  deposited: number
+  deposited = new Decimal(0)
 
   /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
-  denormalizedDebt: number
+  denormalizedDebt = new Decimal(0)
 
   /** The ordered number of when this vault was created. */
   vaultNumber: number
@@ -32,8 +32,8 @@ export class VaultAccount {
   /** Collateral redistribution snapshot' */
   collateralAccumulatorSnapshotBytes = new Decimal(0)
 
-  /** The vault type eg '2-SOL-150-0' */
-  vaultTypeName: string
+  /** The vault type eg 'SOL-150' */
+  collateralType: string
 
   /** Current State of the vault ("Open", "Closed", "Liquidated") */
   vaultStatus = ''
@@ -41,29 +41,29 @@ export class VaultAccount {
   /** The public key of the next vault to redeem. */
   nextVaultToRedeem: PublicKey
 
-  /** The public key of the vault type. */
-  vaultType: PublicKey
-
   constructor(vault: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
     this.vaultNumber = vault.vaultNumber?.toNumber()
     this.pdaSalt = vault.pdaSalt
-    this.deposited = vault.deposited?.toNumber()
-    this.denormalizedDebt = vault.denormalizedDebt?.toNumber()
+    if (vault.deposited){
+      this.deposited = new Decimal(vault.deposited.toString())
+    }
+    if (vault.denormalizedDebt){
+      this.denormalizedDebt = new Decimal(vault.denormalizedDebt.toString())
+    }
     if (vault.debtProductSnapshotBytes) {
       this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
     }
     if (vault.collateralAccumulatorSnapshotBytes) {
       this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vault.collateralAccumulatorSnapshotBytes.toString())
     }
-    this.vaultTypeName = vault.vaultTypeName
+    this.collateralType = vault.collateralType
     this.nextVaultToRedeem = vault.nextVaultToRedeem
 
     if (vault.vaultStatus) {
       this.vaultStatus = Object.keys(vault.vaultStatus)[0]
     }
-    this.vaultType = vault.vaultType
   }
 
   /**
@@ -82,7 +82,7 @@ export class VaultAccount {
    * @returns collateral value in SOL
    */
   public inSol(): number {
-    return this.deposited / LAMPORTS_PER_SOL
+    return this.deposited.div(LAMPORTS_PER_SOL).toNumber()
   }
 
   /**
@@ -91,7 +91,7 @@ export class VaultAccount {
    * @returns debt value in USH
    */
   public inUsd(): number {
-    return this.denormalizedDebt / LAMPORTS_PER_SOL
+    return this.denormalizedDebt.div(LAMPORTS_PER_SOL).toNumber()
   }
 
   /**
@@ -107,37 +107,37 @@ export class VaultAccount {
 
   public addDebt(newNormalizedDebt: Decimal, vaultTypeCompoundedInterest: Decimal) {
     const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest)
-    this.denormalizedDebt = denormalizedNewDebt.add(new Decimal(this.denormalizedDebt)).floor().toNumber()
+    this.denormalizedDebt = denormalizedNewDebt.add(new Decimal(this.denormalizedDebt)).floor()
     // this.denormalizedDebt = parseFloat(this.denormalizedDebt.toFixed(0))
   }
   public addDeposit(depositAmount: number) {
-    this.deposited += depositAmount
+    this.deposited = this.deposited.add(depositAmount)
   }
 
   public redeem() {
     // TODO - Calculate actual redeem amount and adust correctly
-    this.denormalizedDebt = 0
+    this.denormalizedDebt = new Decimal(0)
     this.vaultStatus = 'initialized'
   }
   public liquidate() {
     // TODO - Calculate actual liquidate amount and adust correctly
-    this.denormalizedDebt = 0
+    this.denormalizedDebt = new Decimal(0)
     this.vaultStatus = 'liquidated'
   }
 
-  public updateDebtAndCollateral(vaultTypeAccountData: any) {
-    const debtProductCurrent = DecimalFromU128(vaultTypeAccountData.debtRedistributionProduct)
+  public updateDebtAndCollateral(vaultTypeAccuntData: any) {
+    const debtProductCurrent = DecimalFromU128(vaultTypeAccuntData.debtRedistributionProduct)
 
-    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccountData.collateralRedistributionAccumulator)
+    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccuntData.collateralRedistributionAccumulator)
 
     this.denormalizedDebt = debtProductCurrent
       .div(this.debtProductSnapshotBytes)
       .mul(new Decimal(this.denormalizedDebt))
-      .toNumber()
 
     const extraCollateralDeposited =
-      this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
-    this.deposited += extraCollateralDeposited
+      this.denormalizedDebt.mul(collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes))
+
+    this.deposited = this.deposited.add(extraCollateralDeposited)
 
     this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent
     this.debtProductSnapshotBytes = debtProductCurrent
@@ -149,7 +149,7 @@ export class VaultAccount {
       arrow = ' <----!!'
     }
     let collateralRatio = 'Infinite'
-    if (this.denormalizedDebt > 0) {
+    if (this.denormalizedDebt.greaterThan(0)) {
       collateralRatio = new Decimal(this.deposited).div(new Decimal(this.denormalizedDebt)).toString()
     }
 
@@ -160,7 +160,7 @@ export class VaultAccount {
 
     return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${
       this.denormalizedDebt
-    } Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `
+    } Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `
   }
   /**
    * Creates a VaultAccount from a slice of data

package/src/utils/getLinkedListAccounts.ts

@@ -22,7 +22,7 @@ export async function getLinkedListAccounts(
   liquidate: boolean,
   cachedVaults?: VaultAccount[]
 ): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]> {
-  // console.log('Getting getLinkedListAccounts')
+  console.log('Getting getLinkedListAccounts')
   const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
 
   // Default for null is the vault itself, so set them all to this vault
@@ -31,7 +31,6 @@ export async function getLinkedListAccounts(
   let newLargerPublicKey = vaultPublicKey
 
   const thisVaultData = await program.account.vault.fetch(vaultPublicKey)
-  const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
   const thisVault = new VaultAccount(thisVaultData, vaultPublicKey)
 
   // Load all the vaults
@@ -55,11 +54,11 @@ export async function getLinkedListAccounts(
     // vaults = allVaults.map((vault) => {
     //   return new VaultAccount(vault.account, vault.publicKey)
     // })
-    vaults = await getMiniVaults(program, vaultTypeAccount.vaultTypeName)
+    vaults = await getMiniVaults(program, vaultTypeAccount.collateralType)
   }
 
-  // console.log('Vault count found:', vaults.length)
-  // console.log('First Vault', vaults[0])
+  console.log('Vault count found:', vaults.length)
+  console.log('First Vault', vaults[0])
 
   // Filter out the accounts that are not open
   // TODO filter on vault status. Or we enable people to "close out" empty vaults 
@@ -69,7 +68,7 @@ export async function getLinkedListAccounts(
 
   // Remove any vaults with no debt or collateral
   vaults = _.filter(vaults, (vault) => {
-    return vault.denormalizedDebt > 0 && vault.deposited > 0
+    return vault.denormalizedDebt.greaterThan(0) && vault.deposited.greaterThan(0)
   })
 
   // Sort them
@@ -88,12 +87,6 @@ export async function getLinkedListAccounts(
     oldSmallerPublicKey = vaults[indexBefore - 1].publicKey
   }
 
-  // Pretty print the list again
-  // console.log('Sorted open vaults. Index Before: ', indexBefore)
-  // console.log(vaults.map((vault) => {
-  //   return vault.toString(vaultPublicKey)
-  // }))
-
   // Pretty print all the vaults before the operation
   // console.log('Sorted open vaults BEFORE at index:', indexBefore)
   // let correctOrderBefore = true
@@ -137,13 +130,19 @@ export async function getLinkedListAccounts(
     vaults[indexBefore].redeem()
   }
 
-  if (vaults[indexBefore].denormalizedDebt === 0) {
+  if (vaults[indexBefore].denormalizedDebt.isZero()) {
     vaults.splice(indexBefore, 1)
   }
 
   // Sort it again since we've changed one vault
   vaults = vaults.sort(sortVaults)
 
+  // Pretty print the list again
+  // console.log('Sorted open vaults with new debt added at index: ', indexAfter)
+  // console.log(vaults.map((vault) => {
+  //   return vault.toString(vaultPublicKey)
+  // }))
+
   // Search for the vaults new position
   let indexAfter = -1
   vaults.forEach((vault, index) => {
@@ -161,7 +160,8 @@ export async function getLinkedListAccounts(
   // )
 
   // Print where it moved from / to
-  // console.log('Index After', indexAfter)
+  console.log('Index Before', indexBefore)
+  console.log('Index After', indexAfter)
 
   // Save references to the new left and right
   if (indexAfter > 0) {
@@ -182,15 +182,19 @@ export async function getLinkedListAccounts(
 // Sort function we can use to sort the vaults
 // Sorted by collateral ratio. If two are the same, newer vault first
 function sortVaults(a: VaultAccount, b: VaultAccount) {
-  const aRatio = a.deposited / a.denormalizedDebt
-  const bRatio = b.deposited / b.denormalizedDebt
-  if (aRatio === bRatio) {
+  const aRatio = a.deposited.floor().div(a.denormalizedDebt.floor())
+  const bRatio = b.deposited.floor().div(b.denormalizedDebt.floor())
+  if (aRatio.equals(bRatio)) {
     return b.vaultNumber - a.vaultNumber
   }
-  return aRatio - bRatio
+  if (aRatio.greaterThan(bRatio)){
+    return 1
+  }
+
+  return -1
 }
 
-async function getMiniVaults(program: Program<Vault>, vaultTypeName: string ) {
+async function getMiniVaults(program: Program<Vault>, collateralType: string) {
   const filters = [
     // Filter for Vault Accounts
     {
@@ -200,7 +204,7 @@ async function getMiniVaults(program: Program<Vault>, vaultTypeName: string ) {
     // Filter for Vaults with this collateral type
     {
       memcmp: {
-        bytes: base58.encode(VaultAccount.getBufferForString(vaultTypeName)),
+        bytes: base58.encode(VaultAccount.getBufferForString(collateralType)),
         offset: 8 + 32 + 24,
       },
     },