hedge-web3 0.2.24 → 0.2.26

package/src/Constants.ts

@@ -1,194 +1,153 @@
-import {
-  ASSOCIATED_TOKEN_PROGRAM_ID,
-  TOKEN_PROGRAM_ID,
-} from '@solana/spl-token'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HedgeEohwU6RqokrvPU4Hb6XKPub8NuKbnPmY7FoMMtN'
-export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
-
-export const CHAINLINK_SOL_USD_ID =
-  'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
+export const CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
 export const CHAINLINK_SOL_USD_PUBLICKEY = new PublicKey(CHAINLINK_SOL_USD_ID)
-export const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
+export const CHAINLINK_PROGRAM_ID = 'HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny'
 
 const enc = new TextEncoder()
 
 /**
  * @returns The Liquidation pool public key
  */
-export async function getLiquidationPoolStatePublicKey(): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('LiquidationPoolStateV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getLiquidationPoolStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
- * 
+ *
  * @returns The liquidation pool ush account public key
  */
-export async function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('LiquidationPoolUSHAccountV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getLiquidationPoolUshAccountPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
- * 
+ *
  * @returns The USH mint public key
  */
-export async function getUshMintPublicKey(): Promise<PublicKey> {
-  const [findMintPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('UshMintV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getUshMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [findMintPublicKey] = await PublicKey.findProgramAddress([enc.encode('UshMintV1')], hedgeProgramId)
   return findMintPublicKey
 }
 /**
- * 
+ *
  * @returns The Vault System State public key
  */
-export async function getVaultSystemStatePublicKey(): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('VaultSystemStateV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getVaultSystemStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], hedgeProgramId)
   return publicKey
 }
 
 /**
- * 
+ *
  * @returns The Referral State public key
  */
-export async function getReferralStatePublicKey(): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('ReferralStateV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getReferralStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('ReferralStateV1')], hedgeProgramId)
   return publicKey
 }
 
 /**
- * 
+ *
  * @returns The Referral State public key based off the owner's public key
  */
-export async function getReferralAccountPublicKey(
-  ownerPublicKey: PublicKey
-): Promise<PublicKey> {
-  const strToEncode = ownerPublicKey.toBuffer()//.substring(0, 28)
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('refer_acct'), strToEncode],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getReferralAccountPublicKey(hedgeProgramId: PublicKey, ownerPublicKey: PublicKey): Promise<PublicKey> {
+  const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('refer_acct'), strToEncode], hedgeProgramId)
   return publicKey
 }
 
 /**
- * 
+ *
  * @returns The user referral account public key based off the user's public key
  */
- export async function getUserReferralAccountPublicKey(
+export async function getUserReferralAccountPublicKey(
+  hedgeProgramId: PublicKey,
   ownerPublicKey: PublicKey
 ): Promise<PublicKey> {
-  const strToEncode = ownerPublicKey.toBuffer()//.substring(0, 28)
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('user_ref'), strToEncode],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+  const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('user_ref'), strToEncode], hedgeProgramId)
   return publicKey
 }
 
 /**
- * 
+ *
  * @returns The HDG mint public key
  */
-export async function getHedgeMintPublicKey(): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('HEDGEMintV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getHedgeMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], hedgeProgramId)
   return publicKey
 }
 /**
  * Get the public key for any staking pool
- * 
+ *
  * @param mintPublicKey Staked collateral mint public key
  * @returns the public key for that staking pool
  */
 export async function getPoolPublicKeyForMint(
+  hedgeProgramId: PublicKey,
   mintPublicKey: PublicKey
 ): Promise<[PublicKey, number, string]> {
   const strToEncode = mintPublicKey.toString().substring(0, 12)
-  const [publicKey, bump] = await PublicKey.findProgramAddress(
-    [enc.encode(strToEncode)],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode(strToEncode)], hedgeProgramId)
   return [publicKey, bump, strToEncode]
 }
 
 /**
- * 
+ *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type account
  */
-export async function getVaultTypeAccountPublicKey(
-  collateralType: string
-): Promise<PublicKey> {
+export async function getVaultTypeAccountPublicKey(hedgeProgramId: PublicKey, collateralType: string): Promise<PublicKey> {
   const [vaultTypeAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('State')],
-    HEDGE_PROGRAM_PUBLICKEY
+    hedgeProgramId
   )
   return vaultTypeAccount
 }
 
 /**
- * 
+ *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type oracle info
  */
 export async function getVaultTypeOracleAccountPublicKey(
+  hedgeProgramId: PublicKey,
   collateralType: string
 ): Promise<PublicKey> {
   const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('Oracle')],
-    HEDGE_PROGRAM_PUBLICKEY
+    hedgeProgramId
   )
   return vaultTypeOracleAccount
 }
 
 /**
  * Vaults are stored in PDA accounts. Use this to get the address from a salt
- * 
+ *
  * @param vaultSalt String salt for the vault (must be 8 chars)
  * @returns The public key for that Vault Type oracle info
  */
-export async function findVaultAddress(vaultSalt: string): Promise<PublicKey> {
-  const [vaultAddress] = await PublicKey.findProgramAddress(
-    [enc.encode('Vault'), enc.encode(vaultSalt)],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function findVaultAddress(hedgeProgramId: PublicKey, vaultSalt: string): Promise<PublicKey> {
+  const [vaultAddress] = await PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], hedgeProgramId)
   return vaultAddress
 }
 
 /**
- * 
+ *
  * @param walletAddress Owner public key
  * @param tokenMintAddress Token mint
  * @returns The associated token account public key
  */
 export async function findAssociatedTokenAddress(
+  hedgeProgramId: PublicKey,
   walletAddress: PublicKey,
   tokenMintAddress: PublicKey
 ): Promise<PublicKey> {
   return (
     await PublicKey.findProgramAddress(
-      [
-        walletAddress.toBuffer(),
-        TOKEN_PROGRAM_ID.toBuffer(),
-        tokenMintAddress.toBuffer(),
-      ],
+      [walletAddress.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMintAddress.toBuffer()],
       ASSOCIATED_TOKEN_PROGRAM_ID
     )
   )[0]

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()
 }