hedge-web3 0.1.4 → 0.1.6

package/src/instructions/repayVault.ts

@@ -1,20 +1,18 @@
-import { BN, Program } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@project-serum/anchor'
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { ConfirmOptions, Connection, Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey, HEDGE_PROGRAM_ID } from '../Constants'
-
-import { vaultIdl } from '../idl/idl'
+import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function repayVault (
-  connection: Connection,
+  program: Program,
+  provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
-  repayAmount: number,
-  confirmOptions?: ConfirmOptions
+  repayAmount: number
 ): Promise<PublicKey> {
   const [usdhMintPublickey] = await getUsdhMintPublicKey()
   const USDH = new Token(
-    connection,
+    provider.connection,
     usdhMintPublickey,
     TOKEN_PROGRAM_ID,
     payer
@@ -26,6 +24,7 @@ export async function repayVault (
   const history = Keypair.generate()
   const transaction = new Transaction().add(
     await repayVaultInstruction(
+      program,
       payer.publicKey,
       payerUsdhAccount.address,
       vaultPublicKey,
@@ -33,18 +32,18 @@ export async function repayVault (
       repayAmount
     )
   )
-  await sendAndConfirmTransaction(connection, transaction, [payer, history], confirmOptions)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
   return vaultPublicKey
 }
 
 export async function repayVaultInstruction (
+  program: Program,
   payerPublicKey: PublicKey,
   ownerUsdhAccount: PublicKey,
   vaultPublickey: PublicKey,
   historyPublicKey: PublicKey,
   repayAmount: number
 ): Promise<TransactionInstruction> {
-  const program = new Program(vaultIdl, HEDGE_PROGRAM_ID)
   const [vaultSystemStatePublicKey] = await getVaultSystemStatePublicKey()
   const [usdhMintPublickey] = await getUsdhMintPublicKey()
   const [hedgeMintPublickey] = await getHedgeMintPublicKey()

package/src/instructions/withdrawStakingPool.ts

@@ -1,39 +1,38 @@
-import { BN, Program } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { ConfirmOptions, Connection, Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey, HEDGE_PROGRAM_ID } from '../Constants'
-
-import { vaultIdl } from '../idl/idl'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function withdrawStakingPool (
-  connection: Connection,
+  program: Program,
+  provider: Provider,
   payer: Signer,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
-  overrideStartTime?: number,
-  confirmOptions?: ConfirmOptions
+  overrideStartTime?: number
 ): Promise<PublicKey> {
   const poolPosition = Keypair.generate()
   const transaction = new Transaction().add(
     await withdrawStakingPoolInstruction(
+      program,
       payer.publicKey,
       poolPositionPublicKey,
       stakedTokenMintPublicKey,
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(connection, transaction, [payer], confirmOptions).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 
 export async function withdrawStakingPoolInstruction (
+  program: Program,
   payerPublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const program = new Program(vaultIdl, HEDGE_PROGRAM_ID)
   const [vaultSystemStatePublicKey] = await getVaultSystemStatePublicKey()
   const [usdhMintPublickey] = await getUsdhMintPublicKey()
   const [hedgeMintPublickey] = await getHedgeMintPublicKey()

package/src/instructions/withdrawVault.ts

@@ -1,21 +1,19 @@
-import { BN, Program } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@project-serum/anchor'
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { ConfirmOptions, Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { CHAINLINK_SOL_USD_PUBLICKEY, getUsdhMintPublicKey, getVaultSystemStatePublicKey, HEDGE_PROGRAM_ID } from '../Constants'
-
-import { vaultIdl } from '../idl/idl'
+import { Keypair, LAMPORTS_PER_SOL, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { CHAINLINK_SOL_USD_PUBLICKEY, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function withdrawVault (
-  connection: Connection,
+  program: Program,
+  provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
   withdrawAmount: number,
-  chainlinkOverridePrice?: number,
-  confirmOptions?: ConfirmOptions
+  chainlinkOverridePrice?: number
 ): Promise<PublicKey> {
   const [usdhMintPublickey] = await getUsdhMintPublicKey()
   const USDH = new Token(
-    connection,
+    provider.connection,
     usdhMintPublickey,
     TOKEN_PROGRAM_ID,
     payer
@@ -28,6 +26,7 @@ export async function withdrawVault (
   const [vaultSystemStatePublicKey] = await getVaultSystemStatePublicKey()
   const transaction = new Transaction().add(
     withdrawVaultInstruction(
+      program,
       vaultSystemStatePublicKey,
       payer.publicKey,
       vaultPublicKey,
@@ -36,11 +35,12 @@ export async function withdrawVault (
       chainlinkOverridePrice
     )
   )
-  await sendAndConfirmTransaction(connection, transaction, [payer, history], confirmOptions)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
   return vaultPublicKey
 }
 
 export function withdrawVaultInstruction (
+  program: Program,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   vaultPublickey: PublicKey,
@@ -48,7 +48,6 @@ export function withdrawVaultInstruction (
   withdrawAmount: number,
   chainlinkOverridePrice?: number
 ): TransactionInstruction {
-  const program = new Program(vaultIdl, HEDGE_PROGRAM_ID)
   return program.instruction.withdrawVault(
     new BN(withdrawAmount),
     new BN(chainlinkOverridePrice ?? 200 * LAMPORTS_PER_SOL),

package/src/state/LiquidationPoolEra.ts

@@ -1,6 +1,6 @@
 
 import Decimal from 'decimal.js'
-import { DecimalFromU128 } from '..'
+import { DecimalFromU128 } from '../HedgeDecimal'
 
 /**
  * Represents an on-chian pool era. In the event an era is depleted of deposits, a new era is
@@ -9,13 +9,13 @@ import { DecimalFromU128 } from '..'
 export class LiquidationPoolEra {
   public totalDeposits: number
 
-  product: Decimal
+  public product: Decimal
 
-  sum: Decimal
+  public sum: Decimal
 
-  hedgeRewardsAccumulator: Decimal
+  public hedgeRewardsAccumulator: Decimal
 
-  hedgeRewardsTimestamp: number
+  public hedgeRewardsTimestamp: number
 
   constructor (public liquidyPoolEra: any) {
     this.totalDeposits = liquidyPoolEra.totalDeposits.toNumber()

package/src/state/LiquidationPosition.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from '@solana/web3.js'
+import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
-import { DecimalFromU128 } from '..'
+import { DecimalFromU128 } from '../HedgeDecimal'
 import { LiquidationPoolEra } from './LiquidationPoolEra'
 import { LiquidationPoolState } from './LiquidationPoolState'
 
@@ -48,22 +48,30 @@ export class LiquidationPosition {
     return this.era.sum.minus(this.sumSnapshot).div(this.productSnapshot).mul(new Decimal(this.deposit)).floor()
   }
 
-  //   getHedgeAvailable () {
-  //     const LiquidationPoolTotalSupply = 2000000.0 * LAMPORTS_PER_SOL
-  //     const hedgeRewardsSinceLastUpdate = hedgeRewardsDecay(
-  //       LiquidationPoolTotalSupply,
-  //       this.liquidationPoolState.hedgeInitRewardsTimestamp * 1000,
-  //       this.era.hedgeRewardsTimestamp * 1000,
-  //       Date.now(),
-  //       365 * 1000)
+  public getHedgeAvailable (): Decimal {
+    const LiquidationPoolTotalSupply = 2000000.0 * LAMPORTS_PER_SOL
+    const hedgeRewardsSinceLastUpdate = hedgeRewardsDecay(
+      LiquidationPoolTotalSupply,
+      this.liquidationPoolState.hedgeInitRewardsTimestamp * 1000,
+      this.era.hedgeRewardsTimestamp * 1000,
+      Date.now(),
+      365 * 1000)
 
-  //     if (this.era.totalDeposits === 0) {
-  //       return 0
-  //     }
+    if (this.era.totalDeposits === 0) {
+      return new Decimal(0)
+    }
 
-//     const rewardsPerToken = hedgeRewardsSinceLastUpdate / this.era.totalDeposits * this.era.product
-//     const newAccumulator = this.era.hedgeRewardsAccumulator + rewardsPerToken
-//     const hedgeAvailable = (newAccumulator - this.hedgeRewardsSnapshot) * this.deposit / this.productSnapshot
-//     return hedgeAvailable
-//   }
+    const rewardsPerToken = this.era.product.mul(new Decimal(hedgeRewardsSinceLastUpdate / this.era.totalDeposits))
+    const newAccumulator = rewardsPerToken.add(new Decimal(this.era.hedgeRewardsAccumulator))
+    const hedgeAvailable = (newAccumulator.minus(this.hedgeRewardsSnapshot)).mul(new Decimal(this.deposit)).div(new Decimal(this.productSnapshot))
+    return hedgeAvailable
+  }
+}
+
+function hedgeRewardsDecay (supply: number, birthTime: number, timeIn: number, timeOut: number, halfLifeInDays: number): number {
+  const timeInOffsetStart = timeIn - birthTime
+  const timeOutOffsetStart = timeOut - birthTime
+  const halfLife = -1 * Math.log(2) / (halfLifeInDays * 60 * 60 * 24)
+  const awardedTokens = supply * (Math.pow(Math.E, halfLife * timeInOffsetStart) - Math.pow(Math.E, halfLife * timeOutOffsetStart))
+  return awardedTokens
 }

package/src/state/StakingPool.ts

@@ -1,7 +1,7 @@
 
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
-import { DecimalFromU128 } from '..'
+import { DecimalFromU128 } from '../HedgeDecimal'
 
 export class StakingPool {
   public publicKey: PublicKey
@@ -14,10 +14,9 @@ export class StakingPool {
   hedgeRewardAccumulator: Decimal
   usdhFeeAccumulator: Decimal
   solFeeAccumulator: Decimal
-  currentRewardsPerDay: Decimal
 
-  constructor (public poolInfo: any, key: PublicKey) {
-    this.publicKey = key
+  constructor (public poolInfo: any, publicKey: PublicKey) {
+    this.publicKey = publicKey
     this.deposits = poolInfo.deposits.toNumber()
     // this.totalFeesNow = poolInfo.totalFeesNow.toNumber()
     // this.totalFeesPrevious = poolInfo.totalFeesPrevious.toNumber()
@@ -29,7 +28,7 @@ export class StakingPool {
     this.hedgeRewardAccumulator = DecimalFromU128(poolInfo.hedgeRewardAccumulator)
     this.usdhFeeAccumulator = DecimalFromU128(poolInfo.usdhFeeAccumulator)
     this.solFeeAccumulator = DecimalFromU128(poolInfo.solFeeAccumulator)
-    this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
+    // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
   }
 
 //   updateFeeAccumulator () {

package/src/state/StakingPoolPosition.ts

@@ -1,7 +1,7 @@
 
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
-import { DecimalFromU128 } from '..'
+import { DecimalFromU128 } from '../HedgeDecimal'
 import { StakingPool } from './StakingPool'
 
 export class StakingPoolPosition {
@@ -33,8 +33,7 @@ export class StakingPoolPosition {
     this.open = poolPositionInfo.state.open !== undefined
   }
 
-//   getCurrentUsdhFeeReward () {
-//     const feesAccured = (this.pool.usdhFeeAccumulator - this.startUsdhFeeAccumulator) * this.deposited
-//     return feesAccured
-//   }
+  public getCurrentUsdhFeeReward (): Decimal {
+    return this.pool.usdhFeeAccumulator.minus(this.startUsdhFeeAccumulator).times(new Decimal(this.deposited))
+  }
 }

package/src/state/VaultAccount.ts

@@ -34,7 +34,6 @@ export class VaultAccount {
     this.deposited = vault.deposited.toNumber()
     this.minCollateralRatio = DecimalFromU128(vault.minCollateralRatio)
     this.liquidationPrice = vault.liquidationPrice.toNumber()
-    this.minCollateralRatio = vault.minCollateralRatio.toNumber()
     this.vaultStatus = Object.keys(vault.vaultStatus)[0]
   }
 

package/src/state/VaultHistoryEvent.ts

@@ -1,7 +1,7 @@
 
 import { PublicKey } from '@solana/web3.js'
 import Decimal from 'decimal.js'
-import { DecimalFromU128 } from '..'
+import { DecimalFromU128 } from '../HedgeDecimal'
 
 export class VaultHistoryEvent {
   publicKey: PublicKey