hedge-web3 0.1.46 → 0.2.1

package/src/utils/getLinkedListAccounts.ts

@@ -6,10 +6,11 @@ import { getVaultSystemStatePublicKey, getVaultTypeOracleAccountPublicKey, HEDGE
 import { DecimalFromU128 } from '../HedgeDecimal'
 import { VaultAccount } from '../state/VaultAccount'
 import Decimal from 'decimal.js'
-import { Vault } from 'idl/vault'
+import { Vault } from '../idl/vault'
 
 import * as borsh from '@project-serum/borsh'
 import base58 from 'bs58'
+import VaultType from '../state/VaultType'
 
 export async function getLinkedListAccounts(
   program: Program<Vault>,
@@ -22,8 +23,10 @@ export async function getLinkedListAccounts(
   liquidate: boolean,
   cachedVaults?: VaultAccount[]
 ): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]> {
-  // console.log('Getting getLinkedListAccounts')
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeRaw = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultType = new VaultType(vaultTypeRaw, vaultTypeAccountPublicKey)
+
+  const DEBUG = false
 
   // Default for null is the vault itself, so set them all to this vault
   let oldSmallerPublicKey = vaultPublicKey
@@ -31,7 +34,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 accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
   const thisVault = new VaultAccount(thisVaultData, vaultPublicKey)
 
   // Load all the vaults
@@ -39,30 +42,16 @@ export async function getLinkedListAccounts(
   if (cachedVaults) {
     vaults = cachedVaults
   } else {
-    // let allVaults = cachedVaults
-    //   ? cachedVaults
-    //   : (await program.account.vault
-    //       .all([
-    //         {
-    //           memcmp: { bytes: vaultTypeAccount.collateralType, 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)
-    // })
-    vaults = await getMiniVaults(program, vaultTypeAccount.vaultTypeName)
+    vaults = await getMiniVaults(program, vaultTypeAccountPublicKey)
   }
 
-  // console.log('Vault count found:', vaults.length)
-  // console.log('First Vault', vaults[0])
+  if (DEBUG) {
+    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 
+  // TODO filter on vault status. Or we enable people to "close out" empty vaults
   // vaults = _.filter(vaults, (vault) => {
   //   return vault.vaultStatus === 'open'
   // })
@@ -88,11 +77,15 @@ 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)
-  // }))
+  if (DEBUG) {
+    // 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)
@@ -125,9 +118,8 @@ export async function getLinkedListAccounts(
   // Now that we know it's def in the list, iterate the list and update
   // 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)
-  vaults[indexBefore].addDebt(newNormalizedDebt, vaultTypeCompoundedInterest)
+  vaults[indexBefore].updateDebtAndCollateral(vaultType)
+  vaults[indexBefore].addDebt(newNormalizedDebt, vaultType)
   vaults[indexBefore].addDeposit(depositAmount)
 
   if (liquidate) {
@@ -152,16 +144,20 @@ export async function getLinkedListAccounts(
     }
   })
 
-  // New list with vault
-  // console.log('New list with vault now at index:', indexAfter)
-  // console.log(
-  //   vaults.map((vault) => {
-  //     return vault.toString(vaultPublicKey)
-  //   })
-  // )
+  if (DEBUG) {
+    // New list with vault
+    console.log('New list with vault now at index:', indexAfter)
+    console.log(
+      vaults.map((vault) => {
+        return vault.toString(vaultPublicKey)
+      })
+    )
+  }
 
-  // Print where it moved from / to
-  // console.log('Index After', indexAfter)
+  if (DEBUG) {
+    // Print where it moved from / to
+    console.log('Index After', indexAfter)
+  }
 
   // Save references to the new left and right
   if (indexAfter > 0) {
@@ -171,10 +167,12 @@ export async function getLinkedListAccounts(
     newLargerPublicKey = vaults[indexAfter + 1].publicKey
   }
 
-  // Print out the new left/right
-  // console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
-  // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
-  // console.log('newLargerPublicKey', newLargerPublicKey.toString())
+  if (DEBUG) {
+    // Print out the new left/right
+    console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
+    console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
+    console.log('newLargerPublicKey', newLargerPublicKey.toString())
+  }
 
   return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults]
 }
@@ -190,20 +188,27 @@ function sortVaults(a: VaultAccount, b: VaultAccount) {
   return aRatio - bRatio
 }
 
-async function getMiniVaults(program: Program<Vault>, vaultTypeName: string ) {
+async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: PublicKey) {
   const filters = [
     // Filter for Vault Accounts
     {
       // @ts-ignore
       memcmp: program.account.vault.coder.accounts.memcmp(program.account.vault._idlAccount.name),
     },
-    // Filter for Vaults with this collateral type
+    // Filter for Vaults that are open
     {
       memcmp: {
-        bytes: base58.encode(VaultAccount.getBufferForString(vaultTypeName)),
+        bytes: base58.encode(Buffer.from([1])),
         offset: 8 + 32 + 24,
       },
     },
+    // Filter for Vaults with this collateral type
+    {
+      memcmp: {
+        bytes: vaultTypePublicKey.toString(),
+        offset: 8 + 32 + 24 + 1,
+      },
+    },
   ]
   const allAccounts = await program.provider.connection.getProgramAccounts(HEDGE_PROGRAM_PUBLICKEY, {
     filters: filters,
@@ -215,7 +220,7 @@ async function getMiniVaults(program: Program<Vault>, vaultTypeName: string ) {
     },
   })
 
-  return allAccounts.map(vaultData=>{
+  return allAccounts.map((vaultData) => {
     return VaultAccount.FromMiniSlice(vaultData.account.data, vaultData.pubkey)
   })
 }

package/src/utils/sendAndConfirmWithDebug.ts

@@ -0,0 +1,27 @@
+import { Connection, Keypair, Signer, Transaction, TransactionSignature } from '@solana/web3.js'
+
+export default async function sendAndConfirmWithDebug(
+  connection: Connection,
+  transaction: Transaction,
+  signers: Signer[]
+): Promise<TransactionSignature | void> {
+  return connection
+    .sendTransaction(transaction, signers)
+    .then((signature) => {
+      return connection
+        .confirmTransaction(signature)
+        .then((signatureContext) => {
+          return signature
+        })
+        .catch((error) => {
+          console.log('There was an error confirming the transaction', error)
+          console.trace()
+          throw error
+        })
+    })
+    .catch((error) => {
+      console.log('There was an error sending the transaction', error)
+      console.trace()
+      throw error
+    })
+}