hedge-web3 0.2.24 → 0.2.25

package/src/instructions/setHalted.ts

@@ -1,29 +1,10 @@
-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,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
-} from '../Constants'
+import { Program, Provider } from '@project-serum/anchor'
+import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { getVaultSystemStatePublicKey } from '../Constants'
 
+import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
 
 export async function setHalted(
   program: Program<Vault>,
@@ -31,7 +12,7 @@ export async function setHalted(
   payer: Signer,
   halted: boolean
 ): Promise<PublicKey> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   const transaction = new Transaction().add(
     await setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted)

package/src/instructions/transferVault.ts

@@ -1,17 +1,12 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@project-serum/anchor'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
 
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function transferVault(
   program: Program<Vault>,

package/src/instructions/updateReferralAccount.ts

@@ -1,22 +1,15 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer,
+  SystemProgram, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
+  getReferralAccountPublicKey, getVaultSystemStatePublicKey
 } from '../Constants'
 
-import { parseAnchorErrors } from '../utils/Errors'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export interface ReferralAccountConfig {
   setupCut?: BN
@@ -34,8 +27,8 @@ export async function updateReferralAccount(
   referrer: PublicKey,
   config: ReferralAccountConfig
 ): Promise<PublicKey> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId, )
+  const referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
   const transaction = new Transaction().add(
     await updateReferralAccountInstruction(
       program,

package/src/instructions/updateReferralState.ts

@@ -1,22 +1,15 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer,
+  SystemProgram, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
-  getVaultSystemStatePublicKey,
-  getReferralStatePublicKey,
+  getReferralStatePublicKey, getVaultSystemStatePublicKey
 } from '../Constants'
 
-import { parseAnchorErrors } from '../utils/Errors'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export interface ReferralStateConfig {
   setupCut?: BN
@@ -43,8 +36,8 @@ export async function updateReferralState(
   payer: Signer,
   config: ReferralStateConfig
 ): Promise<PublicKey> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const referralStatePublicKey = await getReferralStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId, )
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId, )
   const transaction = new Transaction().add(
     await updateReferralStateInstruction(
       program,

package/src/instructions/updateVaultType.ts

@@ -1,44 +1,30 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
-  findAssociatedTokenAddress,
-  findVaultAddress,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
 
-import { v4 as uuidv4 } from 'uuid'
-import { parseAnchorErrors } from '../utils/Errors'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export interface VaultTypeConfig {
   maxDebtExtended?: BN
   minDebtPerVault?: BN
   loanInitFee?: BN
   interestRatePerSecond?: BN
-  
+
   emergencyModeThreshold?: BN
 
   oracleChainlink?: PublicKey
   oraclePyth?: PublicKey
   oracleSwitchboard?: PublicKey
 
-  priorityPyth?: number,
-  priorityChainlink?: number,
-  prioritySwitchboard?: number,
+  priorityPyth?: number
+  priorityChainlink?: number
+  prioritySwitchboard?: number
 
   deprecated?: boolean
 }
@@ -51,7 +37,7 @@ export async function updateVaultType(
   oracleInfoAccount: PublicKey,
   config: VaultTypeConfig
 ): Promise<PublicKey> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   const transaction = new Transaction().add(
     await updateVaultTypeStatusInstruction(
       program,

package/src/instructions/withdrawStakingPool.ts

@@ -1,25 +1,21 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer,
+  SystemProgram, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
   getPoolPublicKeyForMint,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function withdrawStakingPool(
   program: Program<Vault>,
@@ -51,16 +47,16 @@ export async function withdrawStakingPoolInstruction(
   stakedTokenMintPublicKey: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [poolPublickey] = await getPoolPublicKeyForMint(stakedTokenMintPublicKey)
-  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, stakedTokenMintPublicKey)
-  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
-  const payerAssociatedStakedTokenAccount = await findAssociatedTokenAddress(payerPublicKey, stakedTokenMintPublicKey)
-  const payerAssociatedHedgeAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
-  const payerAssociatedUshAccount = await findAssociatedTokenAddress(payerPublicKey, ushMintPublickey)
-  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId, )
+  const ushMintPublickey = await getUshMintPublicKey(program.programId, )
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId, )
+  const [poolPublickey] = await getPoolPublicKeyForMint(program.programId, stakedTokenMintPublicKey)
+  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, stakedTokenMintPublicKey)
+  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, ushMintPublickey)
+  const payerAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, stakedTokenMintPublicKey)
+  const payerAssociatedHedgeAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, hedgeMintPublickey)
+  const payerAssociatedUshAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, ushMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey)
 
   return await program.methods
     .withdrawStakingPool(

package/src/instructions/withdrawVault.ts

@@ -1,26 +1,20 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { TokenInstructions } from '@project-serum/serum'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
-  findAssociatedTokenAddress,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
+  findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
+import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
 
 export async function withdrawVault(
   program: Program<Vault>,
@@ -30,13 +24,13 @@ export async function withdrawVault(
   withdrawAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId, )
 
   // Prep the user to get USH back out at some point
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const history = Keypair.generate()
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId, )
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
   const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -61,8 +55,8 @@ export async function withdrawVault(
     vaultTypeAccountInfo.collateralMint,
     payer.publicKey
   )
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, await getHedgeMintPublicKey(program.programId, ))
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, 
     hedgeStakingPoolPublicKey,
     ushMintPublickey
   )

package/src/utils/getLinkedListAccounts.ts

@@ -1,14 +1,11 @@
-import { Program, Provider, BN } from '@project-serum/anchor'
-import { PublicKey, Signer } from '@solana/web3.js'
+import { BN, Program } from '@project-serum/anchor'
+import { PublicKey } from '@solana/web3.js'
 import _ from 'underscore'
-import { getVaultSystemStatePublicKey, getVaultTypeOracleAccountPublicKey, HEDGE_PROGRAM_PUBLICKEY } from '../Constants'
 
-import { DecimalFromU128 } from '../HedgeDecimal'
-import { VaultAccount } from '../state/VaultAccount'
 import Decimal from 'decimal.js'
 import { Vault } from '../idl/vault'
+import { VaultAccount } from '../state/VaultAccount'
 
-import * as borsh from '@project-serum/borsh'
 import base58 from 'bs58'
 import VaultType from '../state/VaultType'
 
@@ -228,7 +225,7 @@ async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: Public
       },
     },
   ]
-  const allAccounts = await program.provider.connection.getProgramAccounts(HEDGE_PROGRAM_PUBLICKEY, {
+  const allAccounts = await program.provider.connection.getProgramAccounts(program.programId, {
     filters: filters,
     // Slice the data only to grab the 3 u64's of size 8 bytes each
     dataSlice: {