hedge-web3 0.2.24 → 0.2.25

package/src/idl/vault.ts

@@ -2413,33 +2413,54 @@ export type Vault = {
   "accounts": [
     {
       "name": "aggregator",
+      "docs": [
+        "Define the type of state stored in accounts"
+      ],
       "type": {
         "kind": "struct",
         "fields": [
           {
             "name": "isInitialized",
+            "docs": [
+              "Set to true after initialization."
+            ],
             "type": "bool"
           },
           {
             "name": "version",
+            "docs": [
+              "Version of the state"
+            ],
             "type": "u32"
           },
           {
             "name": "config",
+            "docs": [
+              "The configuration for this aggregator"
+            ],
             "type": {
               "defined": "Config"
             }
           },
           {
             "name": "updatedAt",
+            "docs": [
+              "When the config was last updated."
+            ],
             "type": "i64"
           },
           {
             "name": "owner",
+            "docs": [
+              "The aggregator owner is allowed to modify it's config."
+            ],
             "type": "publicKey"
           },
           {
             "name": "submissions",
+            "docs": [
+              "A set of current submissions, one per oracle. Array index corresponds to oracle index."
+            ],
             "type": {
               "array": [
                 {
@@ -2451,6 +2472,9 @@ export type Vault = {
           },
           {
             "name": "answer",
+            "docs": [
+              "The current median answer."
+            ],
             "type": {
               "option": "u128"
             }
@@ -3296,20 +3320,32 @@ export type Vault = {
         "fields": [
           {
             "name": "oracles",
+            "docs": [
+              "A list of oracles allowed to submit answers."
+            ],
             "type": {
               "vec": "publicKey"
             }
           },
           {
             "name": "minAnswerThreshold",
+            "docs": [
+              "Number of submissions required to produce an answer. Must be larger than 0."
+            ],
             "type": "u8"
           },
           {
             "name": "stalenessThreshold",
+            "docs": [
+              "Offset in number of seconds before a submission is considered stale."
+            ],
             "type": "u8"
           },
           {
             "name": "decimals",
+            "docs": [
+              "Decimal places for value representations"
+            ],
             "type": "u8"
           }
         ]
@@ -6392,33 +6428,54 @@ export const IDL: Vault = {
   "accounts": [
     {
       "name": "aggregator",
+      "docs": [
+        "Define the type of state stored in accounts"
+      ],
       "type": {
         "kind": "struct",
         "fields": [
           {
             "name": "isInitialized",
+            "docs": [
+              "Set to true after initialization."
+            ],
             "type": "bool"
           },
           {
             "name": "version",
+            "docs": [
+              "Version of the state"
+            ],
             "type": "u32"
           },
           {
             "name": "config",
+            "docs": [
+              "The configuration for this aggregator"
+            ],
             "type": {
               "defined": "Config"
             }
           },
           {
             "name": "updatedAt",
+            "docs": [
+              "When the config was last updated."
+            ],
             "type": "i64"
           },
           {
             "name": "owner",
+            "docs": [
+              "The aggregator owner is allowed to modify it's config."
+            ],
             "type": "publicKey"
           },
           {
             "name": "submissions",
+            "docs": [
+              "A set of current submissions, one per oracle. Array index corresponds to oracle index."
+            ],
             "type": {
               "array": [
                 {
@@ -6430,6 +6487,9 @@ export const IDL: Vault = {
           },
           {
             "name": "answer",
+            "docs": [
+              "The current median answer."
+            ],
             "type": {
               "option": "u128"
             }
@@ -7275,20 +7335,32 @@ export const IDL: Vault = {
         "fields": [
           {
             "name": "oracles",
+            "docs": [
+              "A list of oracles allowed to submit answers."
+            ],
             "type": {
               "vec": "publicKey"
             }
           },
           {
             "name": "minAnswerThreshold",
+            "docs": [
+              "Number of submissions required to produce an answer. Must be larger than 0."
+            ],
             "type": "u8"
           },
           {
             "name": "stalenessThreshold",
+            "docs": [
+              "Offset in number of seconds before a submission is considered stale."
+            ],
             "type": "u8"
           },
           {
             "name": "decimals",
+            "docs": [
+              "Decimal places for value representations"
+            ],
             "type": "u8"
           }
         ]

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -1,23 +1,19 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
-  findAssociatedTokenAddress,
-  getVaultTypeAccountPublicKey,
-  getLiquidationPoolStatePublicKey,
-  getVaultSystemStatePublicKey,
+  findAssociatedTokenAddress, getLiquidationPoolStatePublicKey,
+  getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
 } 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 claimLiquidationPoolPosition(
   program: Program<Vault>,
@@ -27,7 +23,7 @@ export async function claimLiquidationPoolPosition(
   collateralType: string,
   overrideStartTime?: number
 ): Promise<PublicKey> {
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(program.programId, collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const collateralMintPublicKey = vaultTypeAccountInfo.collateralMint
 
@@ -62,23 +58,29 @@ export async function claimLiquidationPoolPositionInstruction(
   payerAssociatedTokenAccount: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
+  const vaultSystemState = await getVaultSystemStatePublicKey(program.programId)
+  const poolStatePublicKey = await getLiquidationPoolStatePublicKey(program.programId)
+  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    poolStatePublicKey,
+    collateralMint
+  )
 
-  const vaultSystemState = await getVaultSystemStatePublicKey()
-  const poolStatePublicKey = await getLiquidationPoolStatePublicKey()
-  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMint)
-
-  return await program.methods.claimLiquidationPoolPosition().accounts({
-    vaultSystemState: vaultSystemState,
-    poolState: poolStatePublicKey,
-    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()
+  return await program.methods
+    .claimLiquidationPoolPosition()
+    .accounts({
+      vaultSystemState: vaultSystemState,
+      poolState: poolStatePublicKey,
+      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,24 +1,19 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
-  getHedgeMintPublicKey,
-  findAssociatedTokenAddress,
-  getVaultTypeAccountPublicKey,
-  getPoolPublicKeyForMint,
-  getVaultSystemStatePublicKey,
+  getHedgeMintPublicKey, getPoolPublicKeyForMint,
+  getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
 } 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 claimStakingPoolPosition(
   program: Program<Vault>,
@@ -27,11 +22,11 @@ export async function claimStakingPoolPosition(
   payer: Signer,
   collateralType: string
 ): Promise<PublicKey> {
-  const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccount = await getVaultTypeAccountPublicKey(program.programId, collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
   const collateralMint = vaultTypeAccountInfo.collateralMint
-  const stakedTokenMint = await getHedgeMintPublicKey()
-  const [feePool] = await getPoolPublicKeyForMint(stakedTokenMint)
+  const stakedTokenMint = await getHedgeMintPublicKey(program.programId)
+  const [feePool] = await getPoolPublicKeyForMint(program.programId, stakedTokenMint)
   const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -74,7 +69,7 @@ export async function claimStakingPoolPositionInstruction(
   payer: PublicKey,
   payerAssociatedTokenAccount: PublicKey
 ): Promise<TransactionInstruction> {
-  const vaultSystemState = await getVaultSystemStatePublicKey()
+  const vaultSystemState = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .claimStakingPoolPosition()

package/src/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -10,7 +10,9 @@ export async function closeClaimedLiquidationPoolPosition(
   poolPosition: PublicKey,
   payer: Signer
 ): Promise<PublicKey> {
-  const transaction = new Transaction().add(await closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer.publicKey))
+  const transaction = new Transaction().add(
+    await closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer.publicKey)
+  )
 
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition
@@ -25,7 +27,7 @@ export async function closeClaimedLiquidationPoolPositionInstruction(
     .closeClaimedLiquidationPoolPosition()
     .accounts({
       poolPosition: poolPosition,
-      payer: payer
+      payer: payer,
     })
     .instruction()
 }

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -1,27 +1,21 @@
 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,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
-  getLiquidationPoolUshAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
-  getUserReferralAccountPublicKey,
-  getReferralStatePublicKey
+  getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
+  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 closeLiquidationPoolPosition(
   program: Program<Vault>,
@@ -31,19 +25,19 @@ export async function closeLiquidationPoolPosition(
   overrideStartTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     ushMintPublickey,
     payer.publicKey
   )
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const referralStatePublicKey = await getReferralStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
   const liquidationPositionAccount = await program.account.liquidationPosition.fetch(poolPosition)
   const poolEra = liquidationPositionAccount.era
 
-  const hedgeMint = await getHedgeMintPublicKey()
+  const hedgeMint = await getHedgeMintPublicKey(program.programId)
   const payerAssociatedHedgeAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -60,13 +54,13 @@ export async function closeLiquidationPoolPosition(
 
   let referralAccountPublicKey = null
   if (typeof referrer === 'undefined') {
-    referralAccountPublicKey = await getReferralAccountPublicKey(vaultSystemStatePublicKey)  
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
   } else {
-    referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
   }
 
   // Derive the user referral account public key
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payer.publicKey)
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payer.publicKey)
 
   const transaction = new Transaction().add(
     await closeLiquidationPoolPositionInstruction(
@@ -100,11 +94,11 @@ export async function closeLiquidationPoolPositionInstruction(
   referralStatePublicKey: 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()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMint = await getUshMintPublicKey(program.programId)
+  const hedgeMint = await getHedgeMintPublicKey(program.programId)
+  const poolUshAccount = await getLiquidationPoolUshAccountPublicKey(program.programId)
+  const poolState = await getLiquidationPoolStatePublicKey(program.programId)
 
   return await program.methods
     .closeLiquidationPoolPosition(

package/src/instructions/createReferralAccount.ts

@@ -1,29 +1,20 @@
-import { BN, Idl, 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 { BN, Program, Provider } from '@project-serum/anchor'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
-  getHedgeMintPublicKey,
-  getReferralStatePublicKey,
-  getUserReferralAccountPublicKey
+  getHedgeMintPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUserReferralAccountPublicKey, getVaultSystemStatePublicKey
 } from '../Constants'
 
+import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
-
-
 
 /** @type {Function}  - Creates a new referral account.
  * This checks the user has enough HDG in their wallet or staked and
@@ -36,7 +27,7 @@ import { Vault } from '../idl/vault'
  * - poolPublicKey: PublicKey : a key to a pool position. If the position is closed or does not belong to the signer it will be ignored
  * - referrer: PublicKey
  * - overrideTime?: number
-*/
+ */
 export async function createReferralAccount(
   program: Program<Vault>,
   provider: Provider,
@@ -44,24 +35,23 @@ export async function createReferralAccount(
   poolPosition: PublicKey,
   overrideTime?: number
 ): Promise<PublicKey> {
-  // setup transaction  
+  // setup transaction
   const transaction = new Transaction()
   const signers = [payer]
   const referrer = payer.publicKey
 
   // Setup public keys
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   // Find referral account
-  let referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
-
+  let referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
 
   // Get the referral state PDA
-  const referallStatePublicKey = await getReferralStatePublicKey()
+  const referallStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   // Get HDG mint public key
-  const hedgeMintPublicKey = await getHedgeMintPublicKey()
-  
+  const hedgeMintPublicKey = await getHedgeMintPublicKey(program.programId)
+
   // Get HDG account of signer
   const payerHdgAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -71,8 +61,8 @@ export async function createReferralAccount(
   )
 
   // Derive the user referral account public key
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payer.publicKey)
-  
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payer.publicKey)
+
   transaction.add(
     await createReferralAccountInstruction(
       program,
@@ -87,12 +77,10 @@ export async function createReferralAccount(
     )
   )
 
-
   await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return referralAccountPublicKey
 }
 
-
 export async function createReferralAccountInstruction(
   program: Program<Vault>,
   payerPublicKey: PublicKey,
@@ -104,7 +92,7 @@ export async function createReferralAccountInstruction(
   userReferralAccountPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .createReferralAccount(

package/src/instructions/createStakingPool.ts

@@ -1,23 +1,21 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   findAssociatedTokenAddress,
   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 createStakingPool(
   program: Program<Vault>,
@@ -31,7 +29,7 @@ export async function createStakingPool(
     await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
-  const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
+  const [poolPublickey] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
   return poolPublickey
 }
 
@@ -42,12 +40,12 @@ export async function createStakingPoolInstruction(
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
 
-  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, mintPublicKey)
-  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
+  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, mintPublicKey)
+  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, ushMintPublickey)
   return await program.methods
     .createStakingPool(poolBump, new BN(hedgeTokensToBeMinted), new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)))
     .accounts({