hedge-web3 0.1.46 → 0.2.1

package/src/instructions/createStakingPool.ts

@@ -16,7 +16,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createStakingPool(
   program: Program<Vault>,
@@ -29,7 +30,7 @@ export async function createStakingPool(
   const transaction = new Transaction().add(
     await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
   return poolPublickey
 }
@@ -41,7 +42,6 @@ export async function createStakingPoolInstruction(
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  console.log("new createStakingPoolInstruction")
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)

package/src/instructions/createVault.ts

@@ -23,7 +23,8 @@ import {
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createVault(
   program: Program<Vault>,
@@ -106,7 +107,7 @@ export async function createVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return newVaultPublicKey
 }
 

package/src/instructions/depositLiquidationPool.ts

@@ -17,7 +17,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositLiquidationPool(
   program: Program<Vault>,
@@ -45,7 +46,7 @@ export async function depositLiquidationPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositStakingPool.ts

@@ -12,7 +12,8 @@ import {
 } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
 import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositStakingPool(
   program: Program<Vault>,
@@ -33,7 +34,7 @@ export async function depositStakingPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositVault.ts

@@ -19,7 +19,8 @@ import {
   getPoolPublicKeyForMint,
   getHedgeMintPublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
 
 export async function depositVault(
@@ -64,7 +65,6 @@ export async function depositVault(
 
   const transaction = new Transaction()
   const signers = [payer, history]
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
@@ -125,7 +125,7 @@ export async function depositVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers)
   return vaultPublicKey
 }
 

package/src/instructions/initHedgeFoundation.ts

@@ -19,7 +19,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function initHedgeFoundation(program: Program<Vault>, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
@@ -27,7 +28,7 @@ export async function initHedgeFoundation(program: Program<Vault>, provider: Pro
     await initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 

package/src/instructions/initHedgeFoundationTokens.ts

@@ -19,12 +19,13 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function initHedgeFoundationTokens(program: Program, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
   const transaction = new Transaction().add(await initHedgeFoundationTokensInstruction(program, payer.publicKey))
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 

package/src/instructions/liquidateVault.ts

@@ -1,6 +1,7 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider, translateAddress } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
 import {
+  Connection,
   Keypair,
   PublicKey,
   sendAndConfirmTransaction,
@@ -20,7 +21,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function liquidateVault(
   program: Program<Vault>,
@@ -122,7 +124,7 @@ export async function liquidateVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history, newEra])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history, newEra])
   return vaultPublicKey
 }
 

package/src/instructions/loanVault.ts

@@ -19,12 +19,11 @@ import {
   getVaultSystemStatePublicKey,
   HEDGE_PROGRAM_PUBLICKEY,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+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>,
   provider: Provider,
@@ -87,7 +86,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/redeemVault.ts

@@ -19,7 +19,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function redeemVault(
   program: Program<Vault>,
@@ -94,7 +95,7 @@ export async function redeemVault(
       transactionOverrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/refreshOraclePrice.ts

@@ -7,9 +7,11 @@ import {
   SystemProgram,
   Transaction,
   TransactionInstruction,
+  TransactionSignature,
 } from '@solana/web3.js'
-import { Vault } from 'idl/vault'
-import { HEDGE_PROGRAM_PUBLICKEY } from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+import { HEDGE_PROGRAM_PUBLICKEY, CHAINLINK_PROGRAM_ID } from '../Constants'
 
 export async function refreshOraclePrice(
   program: Program<Vault>,
@@ -19,11 +21,11 @@ export async function refreshOraclePrice(
   network: Cluster,
   overridePrice?: number,
   overrideTime?: number
-): Promise<string> {
+): Promise<TransactionSignature | void> {
   const transaction = new Transaction().add(
     await refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime)
   )
-  return await sendAndConfirmTransaction(provider.connection, transaction, [payer])
+  return await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
 }
 
 export async function refreshOraclePriceInstruction(
@@ -55,6 +57,7 @@ export async function refreshOraclePriceInstruction(
       oraclePyth: pythAccounts[network],
       oracleSwitchboard: switchboardAccounts[network],
       systemProgram: SystemProgram.programId,
+      chainlinkProgram: CHAINLINK_PROGRAM_ID,
     })
     .instruction()
 }

package/src/instructions/repayVault.ts

@@ -18,7 +18,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function repayVault(
   program: Program<Vault>,
@@ -75,7 +76,7 @@ export async function repayVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/setHalted.ts

@@ -22,7 +22,8 @@ import {
 } from '../Constants'
 
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function setHalted(
   program: Program<Vault>,
@@ -36,7 +37,7 @@ export async function setHalted(
     await setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return vaultSystemStatePublicKey
 }
 

package/src/instructions/updateVaultType.ts

@@ -21,7 +21,8 @@ import {
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export interface VaultTypeConfig {
   maxDebtExtended?: BN
@@ -32,6 +33,10 @@ export interface VaultTypeConfig {
   oraclePyth?: PublicKey
   oracleSwitchboard?: PublicKey
 
+  priorityPyth?: number,
+  priorityChainlink?: number,
+  prioritySwitchboard?: number,
+
   deprecated?: boolean
 }
 
@@ -55,7 +60,7 @@ export async function updateVaultType(
     )
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
   return vaultSystemStatePublicKey
 }
 
@@ -75,6 +80,9 @@ export async function updateVaultTypeStatusInstruction(
     oraclePyth: vaultTypeConfig.oraclePyth ?? null,
     oracleSwitchboard: vaultTypeConfig.oracleSwitchboard ?? null,
     deprecated: vaultTypeConfig.deprecated ?? null,
+    priorityPyth: vaultTypeConfig.priorityPyth ?? null,
+    priorityChainlink: vaultTypeConfig.priorityChainlink ?? null,
+    prioritySwitchboard: vaultTypeConfig.prioritySwitchboard ?? null,
   }
 
   return await program.methods

package/src/instructions/withdrawStakingPool.ts

@@ -18,7 +18,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function withdrawStakingPool(
   program: Program<Vault>,
@@ -38,7 +39,7 @@ export async function withdrawStakingPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/withdrawVault.ts

@@ -19,7 +19,8 @@ import {
   getHedgeMintPublicKey,
 } from '../Constants'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function withdrawVault(
   program: Program<Vault>,
@@ -98,7 +99,7 @@ export async function withdrawVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/state/VaultAccount.ts

@@ -3,6 +3,8 @@ import Decimal from 'decimal.js'
 import { DecimalFromU128 } from '../HedgeDecimal'
 
 import * as borsh from '@project-serum/borsh'
+import BN from 'bn.js'
+import VaultType from './VaultType'
 
 /**
  * A class that represents an on-chian vault.
@@ -32,7 +34,7 @@ export class VaultAccount {
   /** Collateral redistribution snapshot' */
   collateralAccumulatorSnapshotBytes = new Decimal(0)
 
-  /** The vault type eg '2-SOL-150-0' */
+  /** The vault type eg '2-SOL-150-0-----' */
   vaultTypeName: string
 
   /** Current State of the vault ("Open", "Closed", "Liquidated") */
@@ -105,11 +107,17 @@ export class VaultAccount {
       .substring(this.publicKey.toString().length - 6)}`
   }
 
-  public addDebt(newNormalizedDebt: Decimal, vaultTypeCompoundedInterest: Decimal) {
-    const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest)
+  public addDebt(additionalDebt: Decimal, vaultTypeAccount: VaultType) {
+    let loanFee = new Decimal(0)
+    if (additionalDebt.isPositive()){
+      loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebt)
+    }
+
+    const totalNormalizedLoan = additionalDebt.add(loanFee)
+    const denormalizedNewDebt = totalNormalizedLoan.div(new Decimal(vaultTypeAccount.cumulativeRate.toString()))
     this.denormalizedDebt = denormalizedNewDebt.add(new Decimal(this.denormalizedDebt)).floor().toNumber()
-    // this.denormalizedDebt = parseFloat(this.denormalizedDebt.toFixed(0))
   }
+
   public addDeposit(depositAmount: number) {
     this.deposited += depositAmount
   }
@@ -125,22 +133,19 @@ export class VaultAccount {
     this.vaultStatus = 'liquidated'
   }
 
-  public updateDebtAndCollateral(vaultTypeAccountData: any) {
-    const debtProductCurrent = DecimalFromU128(vaultTypeAccountData.debtRedistributionProduct)
-
-    const collateralAccumulatorCurrent = DecimalFromU128(vaultTypeAccountData.collateralRedistributionAccumulator)
+  public updateDebtAndCollateral(vaultTypeAccountData: VaultType) {
 
-    this.denormalizedDebt = debtProductCurrent
+    this.denormalizedDebt = vaultTypeAccountData.debtRedistributionProduct
       .div(this.debtProductSnapshotBytes)
       .mul(new Decimal(this.denormalizedDebt))
       .toNumber()
 
     const extraCollateralDeposited =
-      this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
+      this.denormalizedDebt * vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
     this.deposited += extraCollateralDeposited
 
-    this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent
-    this.debtProductSnapshotBytes = debtProductCurrent
+    this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator
+    this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct
   }
 
   public toString(highlight: PublicKey): string {

package/src/state/VaultType.ts

@@ -0,0 +1,62 @@
+import { PublicKey } from '@solana/web3.js'
+import Decimal from 'decimal.js'
+import { DecimalFromU128 } from '../HedgeDecimal'
+
+
+export default class VaultType {
+  publicKey?: PublicKey
+  
+  // On Chain Data
+  name: string
+  collateralMint: PublicKey
+  collateralIndex: number
+  recentPrice: Decimal
+  priceLastUpdatedTimestamp: Decimal
+  collateralHeld: Decimal
+  denormalizedDebtExtended: Decimal
+  debtRedistributionProduct: Decimal
+  collateralRedistributionAccumulator: Decimal
+  minCollateralRatio: Decimal
+  loanInitFee: Decimal
+  minDebtPerVault: Decimal
+  maxDebtExtended: Decimal
+  canBeRedeemed: boolean
+  cumulativeRate: Decimal
+  cumulativeRateLastUpdated: Decimal
+  interestRatePerSecond: Decimal
+  firstVaultToRedeem: PublicKey
+
+  constructor(config: any, publicKey?: PublicKey) {
+    this.publicKey = publicKey
+    this.name = config.collateralType
+    this.loanInitFee = DecimalFromU128(config.loanInitFee)
+    this.minCollateralRatio = DecimalFromU128(config.minCollateralRatio)
+    this.interestRatePerSecond = DecimalFromU128(config.interestRatePerSecond)
+    this.minDebtPerVault = DecimalFromU128(config.minDebtPerVault)
+    this.maxDebtExtended = DecimalFromU128(config.maxDebtExtended)
+    this.canBeRedeemed = config.canBeRedeemed
+    this.collateralMint = config.collateralMint
+    this.firstVaultToRedeem = config.firstVaultToRedeem
+
+    this.recentPrice = DecimalFromU128(config.recentPrice?.toString())
+    this.priceLastUpdatedTimestamp = new Decimal(
+      config.priceLastUpdatedTimestamp.toString()
+    )
+    this.collateralHeld = new Decimal(config.collateralHeld.toString())
+    this.denormalizedDebtExtended = new Decimal(
+      config.denormalizedDebtExtended.toString()
+    )
+    this.debtRedistributionProduct = DecimalFromU128(
+      config.debtRedistributionProduct.toString()
+    )
+    this.collateralRedistributionAccumulator = DecimalFromU128(
+      config.collateralRedistributionAccumulator.toString()
+    )
+    this.cumulativeRate = DecimalFromU128(config.cumulativeRate.toString())
+    this.cumulativeRateLastUpdated = new Decimal(
+      config.cumulativeRateLastUpdated.toString()
+    )
+    this.collateralIndex = config.collateralIndex.toNumber()
+
+  }
+}