hedge-web3 0.1.43 → 0.1.46

package/src/instructions/redeemVault.ts

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

package/src/instructions/refreshOraclePrice.ts

@@ -51,7 +51,7 @@ export async function refreshOraclePriceInstruction(
     .accounts({
       oracleInfoAccount: oracleInfoAccount,
       vaultTypeAccount: vaultTypeAccount,
-      oracleChainlink: chainlinkAccunts[network],
+      oracleChainlink: chainlinkAccounts[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 chainlinkAccunts = {
+const chainlinkAccounts = {
   Testing: SystemProgram.programId,
   Devnet: new PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
   MainnetBeta: SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET

package/src/instructions/repayVault.ts

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

package/src/instructions/withdrawVault.ts

@@ -37,7 +37,6 @@ 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,
@@ -46,12 +45,12 @@ export async function withdrawVault(
     true
   )
 
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
 
@@ -70,7 +69,7 @@ export async function withdrawVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     withdrawAmount * -1,
     0,
@@ -86,7 +85,7 @@ export async function withdrawVault(
       destinationTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedCollateralAccount.address,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,

package/src/state/VaultAccount.ts

@@ -26,21 +26,24 @@ export class VaultAccount {
   /** The ordered number of when this vault was created. */
   vaultNumber: number
 
-  /** Debt redistribution snapshop */
+  /** Debt redistribution snapshot */
   debtProductSnapshotBytes = new Decimal(0)
 
-  /** Collateral redistribution snapshop' */
+  /** Collateral redistribution snapshot' */
   collateralAccumulatorSnapshotBytes = new Decimal(0)
 
-  /** The vault type eg 'SOL-150' */
-  collateralType: string
+  /** The vault type eg '2-SOL-150-0' */
+  vaultTypeName: string
 
-  /** Current State of the vautl ("Open", "Closed", "Liquidated") */
+  /** Current State of the vault ("Open", "Closed", "Liquidated") */
   vaultStatus = ''
 
   /** 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
@@ -54,12 +57,13 @@ export class VaultAccount {
     if (vault.collateralAccumulatorSnapshotBytes) {
       this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vault.collateralAccumulatorSnapshotBytes.toString())
     }
-    this.collateralType = vault.collateralType
+    this.vaultTypeName = vault.vaultTypeName
     this.nextVaultToRedeem = vault.nextVaultToRedeem
 
     if (vault.vaultStatus) {
       this.vaultStatus = Object.keys(vault.vaultStatus)[0]
     }
+    this.vaultType = vault.vaultType
   }
 
   /**
@@ -121,10 +125,10 @@ export class VaultAccount {
     this.vaultStatus = 'liquidated'
   }
 
-  public updateDebtAndCollateral(vaultTypeAccuntData: any) {
-    const debtProductCurrent = DecimalFromU128(vaultTypeAccuntData.debtRedistributionProduct)
+  public updateDebtAndCollateral(vaultTypeAccountData: any) {
+    const debtProductCurrent = DecimalFromU128(vaultTypeAccountData.debtRedistributionProduct)
 
-    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccuntData.collateralRedistributionAccumulator)
+    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccountData.collateralRedistributionAccumulator)
 
     this.denormalizedDebt = debtProductCurrent
       .div(this.debtProductSnapshotBytes)
@@ -156,7 +160,7 @@ export class VaultAccount {
 
     return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${
       this.denormalizedDebt
-    } Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `
+    } Collat: ${this.deposited} Ratio: ${collateralRatio} ${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,6 +31,7 @@ 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
@@ -54,11 +55,11 @@ export async function getLinkedListAccounts(
     // vaults = allVaults.map((vault) => {
     //   return new VaultAccount(vault.account, vault.publicKey)
     // })
-    vaults = await getMiniVaults(program, vaultTypeAccount.collateralType)
+    vaults = await getMiniVaults(program, vaultTypeAccount.vaultTypeName)
   }
 
-  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 
@@ -87,6 +88,12 @@ 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
@@ -100,7 +107,7 @@ export async function getLinkedListAccounts(
   //   }
   // }
   // if (correctOrderBefore) {
-  //   console.log(`Verfied the on-chain order of vault type:`, vaultTypeAccount.collateralType)
+  //   console.log(`Verified the on-chain order of vault type:`, vaultTypeAccount.collateralType)
   // } else {
   //   throw new Error('On-Chian vaults not in order!')
   // }
@@ -116,7 +123,7 @@ 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
+  // this vault with the operation we're going to apply
   const newNormalizedDebt = new Decimal(loanAmount)
   const vaultTypeCompoundedInterest = DecimalFromU128(vaultTypeAccount.cumulativeRate.toString())
   vaults[indexBefore].updateDebtAndCollateral(vaultTypeAccount)
@@ -137,12 +144,6 @@ export async function getLinkedListAccounts(
   // 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) => {
@@ -160,8 +161,7 @@ export async function getLinkedListAccounts(
   // )
 
   // Print where it moved from / to
-  console.log('Index Before', indexBefore)
-  console.log('Index After', indexAfter)
+  // console.log('Index After', indexAfter)
 
   // Save references to the new left and right
   if (indexAfter > 0) {
@@ -190,7 +190,7 @@ function sortVaults(a: VaultAccount, b: VaultAccount) {
   return aRatio - bRatio
 }
 
-async function getMiniVaults(program: Program<Vault>, collateralType: string) {
+async function getMiniVaults(program: Program<Vault>, vaultTypeName: string ) {
   const filters = [
     // Filter for Vault Accounts
     {
@@ -200,7 +200,7 @@ async function getMiniVaults(program: Program<Vault>, collateralType: string) {
     // Filter for Vaults with this collateral type
     {
       memcmp: {
-        bytes: base58.encode(VaultAccount.getBufferForString(collateralType)),
+        bytes: base58.encode(VaultAccount.getBufferForString(vaultTypeName)),
         offset: 8 + 32 + 24,
       },
     },