hedge-web3 0.1.14 → 0.1.15

package/src/instructions/loanVault.ts

@@ -1,30 +1,25 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getCollateralStateAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function loanVault (
   program: Program,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
-  loanAmount: number
+  loanAmount: number,
+  overrideTime?: number
 ): Promise<PublicKey> {
   const usdhMintPublickey = await getUsdhMintPublicKey()
-  const USDH = new Token(
-    provider.connection,
-    usdhMintPublickey,
-    TOKEN_PROGRAM_ID,
-    payer
-  )
 
-  // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await USDH.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const collateralStateAccountPublicKey = await getCollateralStateAccountPublicKey(vaultAccount.collateralType)
-  const collateralStateAccount = await program.account.collateralState.fetch(collateralStateAccountPublicKey)
-  const collateralAssociatedTokenAccount = await findAssociatedTokenAddress(collateralStateAccountPublicKey, collateralStateAccount.collateralMint)
-  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, collateralStateAccount.collateralMint)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccount.collateralMint, vaultTypeAccountPublicKey, true)
+  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccount.collateralMint, vaultPublicKey, true)
 
   const history = Keypair.generate()
   const transaction = new Transaction().add(
@@ -33,11 +28,12 @@ export async function loanVault (
       payer.publicKey,
       payerUsdhAccount.address,
       vaultPublicKey,
-      vaultAssociatedTokenAccount,
+      vaultAssociatedTokenAccount.address,
       history.publicKey,
-      collateralStateAccountPublicKey,
-      collateralAssociatedTokenAccount,
-      loanAmount
+      vaultTypeAccountPublicKey,
+      vaultTypeAssociatedTokenAccount.address,
+      loanAmount,
+      overrideTime
     )
   )
   await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
@@ -51,9 +47,10 @@ export async function loanVaultInstruction (
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
-  collateralStateAccount: PublicKey,
-  collateralAssociatedTokenAccount: PublicKey,
-  loanAmount: number
+  vaultTypeAccount: PublicKey,
+  vaultTypeAssociatedTokenAccount: PublicKey,
+  loanAmount: number,
+  overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const usdhMintPublickey = await getUsdhMintPublicKey()
@@ -66,11 +63,12 @@ export async function loanVaultInstruction (
 
   return program.instruction.loanVault(
     new BN(loanAmount),
+    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
-        collateralStateAccount: collateralStateAccount,
-        collateralAssociatedTokenAccount: collateralAssociatedTokenAccount,
+        vaultTypeAccount: vaultTypeAccount,
+        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
         vaultAccount: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,

package/src/instructions/redeemVault.ts

@@ -1,8 +1,8 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 // import { TokenInstructions } from '@project-serum/serum'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getCollateralStateAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function redeemVault (
   program: Program,
@@ -13,31 +13,18 @@ export async function redeemVault (
   transactionOverrideTime?: number
 ): Promise<PublicKey> {
   const usdhMintPublickey = await getUsdhMintPublicKey()
-  const USDH = new Token(
-    provider.connection,
-    usdhMintPublickey,
-    TOKEN_PROGRAM_ID,
-    payer
-  )
 
   // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await USDH.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const collateralStateAccountPublicKey = await getCollateralStateAccountPublicKey(vaultAccount.collateralType)
-  const collateralStateAccountInfo = await program.account.collateralState.fetch(collateralStateAccountPublicKey)
-  const collateralAssociatedTokenAccount = await findAssociatedTokenAddress(collateralStateAccountPublicKey, collateralStateAccountInfo.collateralMint)
-
-  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, collateralStateAccountInfo.collateralMint)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true)
 
-  const token = new Token(
-    provider.connection,
-    collateralStateAccountInfo.collateralMint,
-    TOKEN_PROGRAM_ID,
-    payer
-  )
+  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultPublicKey, true)
 
-  const payerTokenAccount = await token.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  const payerTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey)
 
   const history = Keypair.generate()
   const transaction = new Transaction().add(
@@ -47,10 +34,10 @@ export async function redeemVault (
       payerUsdhAccount.address,
       payerTokenAccount.address,
       vaultPublicKey,
-      vaultAssociatedTokenAccount,
+      vaultAssociatedTokenAccount.address,
       history.publicKey,
-      collateralStateAccountPublicKey,
-      collateralAssociatedTokenAccount,
+      vaultTypeAccountPublicKey,
+      vaultTypeAssociatedTokenAccount.address,
       redeemAmount,
       transactionOverrideTime
     )
@@ -67,8 +54,8 @@ export async function redeemVaultInstruction (
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
-  collateralStateAccount: PublicKey,
-  collateralAssociatedTokenAccount: PublicKey,
+  vaultTypeAccount: PublicKey,
+  vaultTypeAssociatedTokenAccount: PublicKey,
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -86,8 +73,8 @@ export async function redeemVaultInstruction (
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
-        collateralStateAccount: collateralStateAccount,
-        collateralAssociatedTokenAccount: collateralAssociatedTokenAccount,
+        vaultTypeAccount: vaultTypeAccount,
+        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
         vault: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,

package/src/instructions/refreshOraclePrice.ts

@@ -32,7 +32,7 @@ export async function refreshOraclePriceInstruction (
 ): Promise<TransactionInstruction> {
   const enc = new TextEncoder()
   const [oracleInfoAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], HEDGE_PROGRAM_PUBLICKEY)
-  const [collateralStateAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], HEDGE_PROGRAM_PUBLICKEY)
+  const [vaultTypeAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], HEDGE_PROGRAM_PUBLICKEY)
 
   return program.instruction.refreshOraclePrice(
     new BN(overridePrice ?? LAMPORTS_PER_SOL * 150), // override usd/sol price
@@ -40,7 +40,7 @@ export async function refreshOraclePriceInstruction (
     {
       accounts: {
         oracleInfoAccount: oracleInfoAccount,
-        collateralStateAccount: collateralStateAccount,
+        vaultTypeAccount: vaultTypeAccount,
         oracleChainlink: chainlinkAccunts[network],
         oraclePyth: pythAccounts[network],
         oracleSwitchboard: switchboardAccounts[network],

package/src/instructions/repayVault.ts

@@ -1,31 +1,26 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getCollateralStateAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function repayVault (
   program: Program,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
-  repayAmount: number
+  repayAmount: number,
+  overrideTime?: number
 ): Promise<PublicKey> {
   const usdhMintPublickey = await getUsdhMintPublicKey()
-  const USDH = new Token(
-    provider.connection,
-    usdhMintPublickey,
-    TOKEN_PROGRAM_ID,
-    payer
-  )
 
   // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await USDH.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const collateralStateAccountPublicKey = await getCollateralStateAccountPublicKey(vaultAccount.collateralType)
-  const collateralStateAccount = await program.account.collateralState.fetch(collateralStateAccountPublicKey)
-  const collateralAssociatedTokenAccount = await findAssociatedTokenAddress(collateralStateAccountPublicKey, collateralStateAccount.collateralMint)
-  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, collateralStateAccount.collateralMint)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(vaultTypeAccountPublicKey, vaultTypeAccount.collateralMint)
+  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccount.collateralMint)
 
   const history = Keypair.generate()
   const transaction = new Transaction().add(
@@ -36,9 +31,10 @@ export async function repayVault (
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
-      collateralStateAccountPublicKey,
-      collateralAssociatedTokenAccount,
-      repayAmount
+      vaultTypeAccountPublicKey,
+      vaultTypeAssociatedTokenAccount,
+      repayAmount,
+      overrideTime
     )
   )
   await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
@@ -52,9 +48,10 @@ export async function repayVaultInstruction (
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
-  collateralStateAccount: PublicKey,
-  collateralAssociatedTokenAccount: PublicKey,
-  repayAmount: number
+  vaultTypeAccount: PublicKey,
+  vaultTypeAssociatedTokenAccount: PublicKey,
+  repayAmount: number,
+  overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const usdhMintPublickey = await getUsdhMintPublicKey()
@@ -67,11 +64,12 @@ export async function repayVaultInstruction (
 
   return program.instruction.repayVault(
     new BN(repayAmount),
+    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
-        collateralStateAccount: collateralStateAccount,
-        collateralAssociatedTokenAccount: collateralAssociatedTokenAccount,
+        vaultTypeAccount: vaultTypeAccount,
+        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
         vaultAccount: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,

package/src/instructions/setHalted.ts

@@ -0,0 +1,48 @@
+import { BN, Program, Provider } from '@project-serum/anchor'
+import { TokenInstructions } from '@project-serum/serum'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
+import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+
+import { v4 as uuidv4 } from 'uuid'
+import { parseAnchorErrors } from '../utils/Errors'
+
+export async function setHalted (
+  program: Program,
+  provider: Provider,
+  payer: Signer,
+  halted: boolean
+): Promise<PublicKey> {
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+
+
+  const transaction = new Transaction().add(
+    await setHaltedInstruction(
+      program,
+      vaultSystemStatePublicKey,
+      payer.publicKey,
+      halted
+    )
+  )
+
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider?.opts).catch(parseAnchorErrors)
+  return vaultSystemStatePublicKey
+}
+
+export async function setHaltedInstruction (
+  program: Program,
+  vaultSystemStatePublicKey: PublicKey,
+  payerPublicKey: PublicKey,
+  halted: boolean
+): Promise<TransactionInstruction> {
+  const ix = program.instruction.setHalted(
+    halted,
+    {
+      accounts: {
+        payer: payerPublicKey,
+        vaultSystemState: vaultSystemStatePublicKey,
+      },
+      signers: []
+    })
+  return ix
+}

package/src/instructions/withdrawVault.ts

@@ -1,39 +1,37 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { TokenInstructions } from '@project-serum/serum'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getCollateralStateAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
 
 export async function withdrawVault (
   program: Program,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
-  withdrawAmount: number
+  withdrawAmount: number,
+  overrideTime?: number
 ): Promise<PublicKey> {
   const usdhMintPublickey = await getUsdhMintPublicKey()
-  const USDH = new Token(
-    provider.connection,
-    usdhMintPublickey,
-    TOKEN_PROGRAM_ID,
-    payer
-  )
 
   // Prep the user to get USDH back out at some point
-  await USDH.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
 
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const collateralStateAccount = await getCollateralStateAccountPublicKey(vaultAccount.collateralType)
-  const vaultAssociatedCollateralAccount = await findAssociatedTokenAddress(vaultPublicKey, TokenInstructions.WRAPPED_SOL_MINT)
-  const collateralStateAccountInfo = await program.account.collateralState.fetch(collateralStateAccount)
-  const collateralAssociatedTokenAccount = await findAssociatedTokenAddress(collateralStateAccount, collateralStateAccountInfo.collateralMint)
+  const vaultTypeAccount = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, TokenInstructions.WRAPPED_SOL_MINT, vaultPublicKey, true)
 
-  const token = new Token(provider.connection, collateralStateAccountInfo.collateralMint, TOKEN_PROGRAM_ID, payer)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
+  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccount, true)
 
-  const destinationTokenAccount = await token.getOrCreateAssociatedAccountInfo(payer.publicKey)
+  const destinationTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
+  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+    hedgeStakingPoolPublicKey,
+    usdhMintPublickey
+  )
 
   const transaction = new Transaction().add(
     await withdrawVaultInstruction(
@@ -42,11 +40,15 @@ export async function withdrawVault (
       payer.publicKey,
       destinationTokenAccount.address,
       vaultPublicKey,
-      vaultAssociatedCollateralAccount,
-      collateralStateAccount,
-      collateralAssociatedTokenAccount,
+      vaultAssociatedCollateralAccount.address,
+      vaultTypeAccount,
+      vaultTypeAssociatedTokenAccount.address,
+      hedgeStakingPoolPublicKey,
+      hedgeStakingPoolAssociatedUsdhTokenAccount,
+      usdhMintPublickey,
       history.publicKey,
-      withdrawAmount
+      withdrawAmount,
+      overrideTime
     )
   )
   await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
@@ -60,20 +62,28 @@ export async function withdrawVaultInstruction (
   destinationTokenAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedCollateralPublicKey: PublicKey,
-  collateralStateAccount: PublicKey,
-  collateralAssociatedTokenAccount: PublicKey,
+  vaultTypeAccount: PublicKey,
+  vaultTypeAssociatedTokenAccount: PublicKey,
+  hedgeStakingPoolPublicKey: PublicKey,
+  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
+  usdhMint: PublicKey,
   historyPublicKey: PublicKey,
-  withdrawAmount: number
+  withdrawAmount: number,
+  overrideTime?: number
 ): Promise<TransactionInstruction> {
   return program.instruction.withdrawVault(
     new BN(withdrawAmount),
+    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
-        collateralStateAccount: collateralStateAccount,
-        collateralAssociatedTokenAccount: collateralAssociatedTokenAccount,
+        vaultTypeAccount: vaultTypeAccount,
+        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
         vault: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
+        feePool: hedgeStakingPoolPublicKey,
+        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
+        usdhMint: usdhMint,
         history: historyPublicKey,
         vaultOwner: payerPublicKey,
         destinationTokenAccount: destinationTokenAccount,

package/src/state/LiquidationPosition.ts

@@ -43,8 +43,8 @@ export class LiquidationPosition {
     return (era.product.div(this.productSnapshotEntry)).mul(new Decimal(this.deposit))
   }
 
-  public getSolAvailable (era: LiquidationPoolEra): Decimal {
-    return era.sum[0].minus(this.sumSnapshotsEntry[0]).div(this.productSnapshotEntry).mul(new Decimal(this.deposit)).floor()
+  public getTokensAvailable (era: LiquidationPoolEra, index: number): Decimal {
+    return era.sum[index].minus(this.sumSnapshotsEntry[index]).div(this.productSnapshotEntry).mul(new Decimal(this.deposit)).floor()
   }
 
   // public getHedgeAvailable (): Decimal {

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es6",
     "allowJs": true,
     "declaration": true,
     "declarationDir": "declarations",
@@ -8,13 +8,14 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "esnext",
+    "module": "CommonJS",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "baseUrl": "src",
     "noFallthroughCasesInSwitch": true,
     "noImplicitReturns": true,
+    "outDir": "./lib",
   },
   "include": ["src"]
 }

package/.github/workflows/npm-publish.yml

@@ -1,34 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm ci
-      - run: npm run build
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/README.md

@@ -1,44 +0,0 @@
-# Hedge Web3 API
-
-Documentation for the Hedge Web3 TypeScript API.
-
-![NPM Version](https://badge.fury.io/js/hedge-web3.svg)
-
-## Documentation
-
-Documentation can be found here: [https://web3-docs.hedge.so/](https://web3-docs.hedge.so/)
-
-
-## Installation
-
-TypeDoc runs on Node.js and is available as a NPM package.
-
-```sh
-npm install hedge-web3 --save-dev
-```
-
-## Usage
-
-To create a vault, import the package.
-
-```js
-const HedgeWeb3 = require('hedge-web3')
-```
-
-To create a vault and deposit 3 SOL: 
-
-```js
-const vaultPublickey = await HedgeWeb3.createVault(connection, ownerPublicKey, LAMPORTS_PER_SOL * 3, LAMPORTS_PER_SOL * 1.2)
-```
-
-## Contributing
-
-This project is maintained by a community of developers. Contributions are welcome and appreciated.
-You can find Hedge Labs on GitHub; feel free to open an issue or create a pull request:
-https://github.com/Hedge-Finance/hedge-web3
-
-## License
-
-Copyright (c) 2021 [Christopher Coudron](https://hedge.so)<br>
-Copyright (c) 2021 [Hedge Labs Ltd.](https://hedge.so)<br>
-Licensed under the Apache License 2.0.

package/jsconfig.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2020",
-    "jsx": "preserve",
-    "strictFunctionTypes": true
-  },
-  "exclude": [
-    "node_modules",
-    "**/node_modules/*"
-  ]
-}