hedge-web3 0.1.28 → 0.1.32

package/src/index.ts

@@ -31,3 +31,4 @@ export * from './state/LiquidationPoolState'
 export * from './state/LiquidationPosition'
 
 export * from './utils/getLinkedListAccounts'
+export * from './idl/vault'

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -1,11 +1,25 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getLiquidationPoolStatePublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  findAssociatedTokenAddress,
+  getVaultTypeAccountPublicKey,
+  getLiquidationPoolStatePublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
-export async function claimLiquidationPoolPosition (
-  program: Program,
+export async function claimLiquidationPoolPosition(
+  program: Program<Vault>,
   provider: Provider,
   poolPosition: PublicKey,
   payer: Signer,
@@ -14,14 +28,14 @@ export async function claimLiquidationPoolPosition (
 ): Promise<PublicKey> {
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
-  const collateralMint = vaultTypeAccountInfo.collateralMint
+  const collateralMintPublicKey = vaultTypeAccountInfo.collateralMint
 
   const poolStatePublicKey = await getLiquidationPoolStatePublicKey()
-  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMint)
+  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMintPublicKey)
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
-    collateralMint,
+    collateralMintPublicKey,
     payer.publicKey
   )
 
@@ -31,19 +45,19 @@ export async function claimLiquidationPoolPosition (
       poolStatePublicKey,
       poolAssociatedTokenAccount,
       vaultTypeAccountPublicKey,
-      collateralMint,
+      collateralMintPublicKey,
       poolPosition,
       payer.publicKey,
       payerAssociatedTokenAccount.address,
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 
-export async function claimLiquidationPoolPositionInstruction (
-  program: Program,
+export async function claimLiquidationPoolPositionInstruction(
+  program: Program<Vault>,
   poolState: PublicKey,
   poolAssociatedTokenAccount: PublicKey,
   vaultTypeAccount: PublicKey,
@@ -55,22 +69,18 @@ export async function claimLiquidationPoolPositionInstruction (
 ): Promise<TransactionInstruction> {
   const vaultSystemState = await getVaultSystemStatePublicKey()
 
-  return program.instruction.claimLiquidationPoolPosition(
-    {
-      accounts: {
-        vaultSystemState: vaultSystemState,
-        poolState: poolState,
-        poolAssociatedTokenAccount: poolAssociatedTokenAccount,
-        vaultTypeAccount: vaultTypeAccount,
-        collateralMint: collateralMint,
-        poolPosition: poolPosition,
-        payer: payer,
-        payerAssociatedTokenAccount: payerAssociatedTokenAccount,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId,
-        rent: SYSVAR_RENT_PUBKEY
-      },
-      signers: []
-    })
+  return await program.methods.claimLiquidationPoolPosition().accounts({
+    vaultSystemState: vaultSystemState,
+    poolState: poolState,
+    poolAssociatedTokenAccount: poolAssociatedTokenAccount,
+    vaultTypeAccount: vaultTypeAccount,
+    collateralMint: collateralMint,
+    poolPosition: poolPosition,
+    payer: payer,
+    payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+    tokenProgram: TOKEN_PROGRAM_ID,
+    systemProgram: SystemProgram.programId,
+    rent: SYSVAR_RENT_PUBKEY,
+  }).instruction()
 }

package/src/instructions/claimStakingPoolPosition.ts

@@ -1,22 +1,43 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { getHedgeMintPublicKey, findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  getHedgeMintPublicKey,
+  findAssociatedTokenAddress,
+  getVaultTypeAccountPublicKey,
+  getPoolPublicKeyForMint,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
 export async function claimStakingPoolPosition(
-  program: Program,
+  program: Program<Vault>,
   provider: Provider,
   poolPosition: PublicKey,
   payer: Signer,
-  collateralType: string,
+  collateralType: string
 ): Promise<PublicKey> {
   const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
   const collateralMint = vaultTypeAccountInfo.collateralMint
   const stakedTokenMint = await getHedgeMintPublicKey()
   const [feePool] = await getPoolPublicKeyForMint(stakedTokenMint)
-  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, feePool, true)
+  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    feePool,
+    true
+  )
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -37,12 +58,12 @@ export async function claimStakingPoolPosition(
       payerAssociatedTokenAccount.address
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 
 export async function claimStakingPoolPositionInstruction(
-  program: Program,
+  program: Program<Vault>,
   feePool: PublicKey,
   feePoolAssociatedTokenAccount: PublicKey,
   stakedTokenMint: PublicKey,
@@ -54,23 +75,22 @@ export async function claimStakingPoolPositionInstruction(
 ): Promise<TransactionInstruction> {
   const vaultSystemState = await getVaultSystemStatePublicKey()
 
-  return program.instruction.claimStakingPoolPosition(
-    {
-      accounts: {
-        vaultSystemState: vaultSystemState,
-        feePool: feePool,
-        stakedTokenMint: stakedTokenMint,
-        feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-        vaultTypeAccount: vaultTypeAccount,
-        collateralMint: collateralMint,
-        poolPosition: poolPosition,
-        payer: payer,
-        payerAssociatedTokenAccount: payerAssociatedTokenAccount,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        rent: SYSVAR_RENT_PUBKEY
-      },
-      signers: []
+  return await program.methods
+    .claimStakingPoolPosition()
+    .accounts({
+      vaultSystemState: vaultSystemState,
+      feePool: feePool,
+      stakedTokenMint: stakedTokenMint,
+      feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
+      vaultTypeAccount: vaultTypeAccount,
+      collateralMint: collateralMint,
+      poolPosition: poolPosition,
+      payer: payer,
+      payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      rent: SYSVAR_RENT_PUBKEY,
     })
+    .instruction()
 }

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -1,25 +1,56 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  getHedgeMintPublicKey,
+  getLiquidationPoolStatePublicKey,
+  getLiquidationPoolUshAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
-export async function closeLiquidationPoolPosition (
-  program: Program,
+export async function closeLiquidationPoolPosition(
+  program: Program<Vault>,
   provider: Provider,
   poolPosition: PublicKey,
   payer: Signer,
   overrideStartTime?: number
 ): Promise<PublicKey> {
   const ushMintPublickey = await getUshMintPublicKey()
-  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const liquidationPositionAccount = await program.account.liquidationPosition.fetch(poolPosition)
   const poolEra = liquidationPositionAccount.era
 
   const hedgeMint = await getHedgeMintPublicKey()
-  const payerAssociatedHedgeAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, hedgeMint, payer.publicKey)
-  const communityAssociatedHedgeTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true)
+  const payerAssociatedHedgeAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    hedgeMint,
+    payer.publicKey
+  )
+  const communityAssociatedHedgeTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    hedgeMint,
+    vaultSystemStatePublicKey,
+    true
+  )
 
   const transaction = new Transaction().add(
     await closeLiquidationPoolPositionInstruction(
@@ -33,12 +64,12 @@ export async function closeLiquidationPoolPosition (
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition
 }
 
-export async function closeLiquidationPoolPositionInstruction (
-  program: Program,
+export async function closeLiquidationPoolPositionInstruction(
+  program: Program<Vault>,
   poolEra: PublicKey,
   poolPosition: PublicKey,
   payerPublicKey: PublicKey,
@@ -47,33 +78,32 @@ export async function closeLiquidationPoolPositionInstruction (
   communityAssociatedHedgeTokenAccount: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMint = await getUshMintPublicKey()
   const hedgeMint = await getHedgeMintPublicKey()
   const poolUshAccount = await getLiquidationPoolUshAccountPublicKey()
   const poolState = await getLiquidationPoolStatePublicKey()
 
-  return program.instruction.closeLiquidationPoolPosition(
-    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
-    {
-      accounts: {
-        vaultSystemState: vaultSystemStatePublicKey,
-        poolState: poolState,
-        poolEra: poolEra,
-        poolPosition: poolPosition,
-        poolUshAccount: poolUshAccount,
-        payer: payerPublicKey,
-        ownerUshAccount: payerUshAccount,
-        hedgeMint: hedgeMint,
-        ushMint: ushMint,
-        payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-        communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId,
-        rent: SYSVAR_RENT_PUBKEY
-      },
-      signers: []
+  return await program.methods
+    .closeLiquidationPoolPosition(
+      new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
+    )
+    .accounts({
+      vaultSystemState: vaultSystemStatePublicKey,
+      poolState: poolState,
+      poolEra: poolEra,
+      poolPosition: poolPosition,
+      poolUshAccount: poolUshAccount,
+      payer: payerPublicKey,
+      ownerUshAccount: payerUshAccount,
+      hedgeMint: hedgeMint,
+      ushMint: ushMint,
+      payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
+      communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
+      rent: SYSVAR_RENT_PUBKEY,
     })
+    .instruction()
 }

package/src/instructions/createStakingPool.ts

@@ -1,11 +1,25 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  findAssociatedTokenAddress,
+  getPoolPublicKeyForMint,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
-export async function createStakingPool (
-  program: Program,
+export async function createStakingPool(
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   mintPublicKey: PublicKey,
@@ -13,52 +27,40 @@ export async function createStakingPool (
   overrideStartTime?: number
 ): Promise<PublicKey> {
   const transaction = new Transaction().add(
-    await createStakingPoolInstruction(
-      program,
-      payer.publicKey,
-      mintPublicKey,
-      hedgeTokensToBeMinted,
-      overrideStartTime
-    )
+    await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
   return poolPublickey
 }
 
-export async function createStakingPoolInstruction (
-  program: Program,
+export async function createStakingPoolInstruction(
+  program: Program<Vault>,
   payerPublicKey: PublicKey,
   mintPublicKey: PublicKey,
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  console.log("createStakingPoolInstruction program ID", program.programId.toString())
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)
 
   const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, mintPublicKey)
   const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
-
-  return program.instruction.createStakingPool(
-    poolBump,
-    new BN(hedgeTokensToBeMinted),
-    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)),
-    {
-      accounts: {
-        signer: payerPublicKey,
-        vaultSystemState: vaultSystemStatePublicKey,
-        pool: poolPublickey,
-        stakedTokenMintInfo: mintPublicKey,
-        ushMint: ushMintPublickey,
-        poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-        poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
-        rent: SYSVAR_RENT_PUBKEY,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
-      },
-      signers: []
+  return await program.methods
+    .createStakingPool(poolBump, new BN(hedgeTokensToBeMinted), new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)))
+    .accounts({
+      signer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      pool: poolPublickey,
+      stakedTokenMintInfo: mintPublicKey,
+      ushMint: ushMintPublickey,
+      poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+      poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
+      rent: SYSVAR_RENT_PUBKEY,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
     })
+    .instruction()
 }