hedge-web3 0.1.29 → 0.1.31

package/src/idl/vault.ts

@@ -1797,68 +1797,6 @@ export type Vault = {
         ]
       }
     },
-    {
-      "name": "stakingPool",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "halfLifeInDays",
-            "type": "u64"
-          },
-          {
-            "name": "deposits",
-            "type": "u64"
-          },
-          {
-            "name": "startTime",
-            "type": "u64"
-          },
-          {
-            "name": "lastTransactionTime",
-            "type": "u64"
-          },
-          {
-            "name": "hedgeRewardAccumulator",
-            "type": "u128"
-          },
-          {
-            "name": "ushFeeAccumulator",
-            "type": "u128"
-          },
-          {
-            "name": "totalHedgeReward",
-            "type": "u64"
-          },
-          {
-            "name": "stakedTokenMint",
-            "type": "publicKey"
-          },
-          {
-            "name": "seedPhrase",
-            "type": {
-              "array": [
-                "u8",
-                12
-              ]
-            }
-          },
-          {
-            "name": "collateralFeeAccumulator",
-            "type": {
-              "array": [
-                "u128",
-                32
-              ]
-            }
-          },
-          {
-            "name": "bump",
-            "type": "u8"
-          }
-        ]
-      }
-    },
     {
       "name": "stakingPoolPosition",
       "type": {
@@ -1924,75 +1862,63 @@ export type Vault = {
       }
     },
     {
-      "name": "vault",
+      "name": "stakingPool",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultOwner",
-            "type": "publicKey"
-          },
-          {
-            "name": "vaultNumber",
+            "name": "halfLifeInDays",
             "type": "u64"
           },
           {
-            "name": "deposited",
+            "name": "deposits",
             "type": "u64"
           },
           {
-            "name": "denormalizedDebt",
+            "name": "startTime",
             "type": "u64"
           },
           {
-            "name": "collateralType",
-            "type": "string"
+            "name": "lastTransactionTime",
+            "type": "u64"
           },
           {
-            "name": "pdaSalt",
-            "type": "string"
+            "name": "hedgeRewardAccumulator",
+            "type": "u128"
           },
           {
-            "name": "bump",
-            "type": "u8"
+            "name": "ushFeeAccumulator",
+            "type": "u128"
           },
           {
-            "name": "vaultVersion",
+            "name": "totalHedgeReward",
             "type": "u64"
           },
           {
-            "name": "debtProductSnapshotBytes",
-            "type": "u128"
-          },
-          {
-            "name": "collateralAccumulatorSnapshotBytes",
-            "type": "u128"
+            "name": "stakedTokenMint",
+            "type": "publicKey"
           },
           {
-            "name": "debtType",
+            "name": "seedPhrase",
             "type": {
-              "defined": "CurrencyType"
+              "array": [
+                "u8",
+                12
+              ]
             }
           },
           {
-            "name": "vaultStatus",
+            "name": "collateralFeeAccumulator",
             "type": {
-              "defined": "VaultStatus"
+              "array": [
+                "u128",
+                32
+              ]
             }
           },
           {
-            "name": "timeCreated",
-            "type": "u64"
-          },
-          {
-            "name": "timeLastInteraction",
-            "type": "u64"
-          },
-          {
-            "name": "nextVaultToRedeem",
-            "type": {
-              "option": "publicKey"
-            }
+            "name": "bump",
+            "type": "u8"
           }
         ]
       }
@@ -2198,6 +2124,80 @@ export type Vault = {
           }
         ]
       }
+    },
+    {
+      "name": "vault",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "vaultOwner",
+            "type": "publicKey"
+          },
+          {
+            "name": "vaultNumber",
+            "type": "u64"
+          },
+          {
+            "name": "deposited",
+            "type": "u64"
+          },
+          {
+            "name": "denormalizedDebt",
+            "type": "u64"
+          },
+          {
+            "name": "collateralType",
+            "type": "string"
+          },
+          {
+            "name": "pdaSalt",
+            "type": "string"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "vaultVersion",
+            "type": "u64"
+          },
+          {
+            "name": "debtProductSnapshotBytes",
+            "type": "u128"
+          },
+          {
+            "name": "collateralAccumulatorSnapshotBytes",
+            "type": "u128"
+          },
+          {
+            "name": "debtType",
+            "type": {
+              "defined": "CurrencyType"
+            }
+          },
+          {
+            "name": "vaultStatus",
+            "type": {
+              "defined": "VaultStatus"
+            }
+          },
+          {
+            "name": "timeCreated",
+            "type": "u64"
+          },
+          {
+            "name": "timeLastInteraction",
+            "type": "u64"
+          },
+          {
+            "name": "nextVaultToRedeem",
+            "type": {
+              "option": "publicKey"
+            }
+          }
+        ]
+      }
     }
   ],
   "types": [
@@ -4368,68 +4368,6 @@ export const IDL: Vault = {
         ]
       }
     },
-    {
-      "name": "stakingPool",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "halfLifeInDays",
-            "type": "u64"
-          },
-          {
-            "name": "deposits",
-            "type": "u64"
-          },
-          {
-            "name": "startTime",
-            "type": "u64"
-          },
-          {
-            "name": "lastTransactionTime",
-            "type": "u64"
-          },
-          {
-            "name": "hedgeRewardAccumulator",
-            "type": "u128"
-          },
-          {
-            "name": "ushFeeAccumulator",
-            "type": "u128"
-          },
-          {
-            "name": "totalHedgeReward",
-            "type": "u64"
-          },
-          {
-            "name": "stakedTokenMint",
-            "type": "publicKey"
-          },
-          {
-            "name": "seedPhrase",
-            "type": {
-              "array": [
-                "u8",
-                12
-              ]
-            }
-          },
-          {
-            "name": "collateralFeeAccumulator",
-            "type": {
-              "array": [
-                "u128",
-                32
-              ]
-            }
-          },
-          {
-            "name": "bump",
-            "type": "u8"
-          }
-        ]
-      }
-    },
     {
       "name": "stakingPoolPosition",
       "type": {
@@ -4495,75 +4433,63 @@ export const IDL: Vault = {
       }
     },
     {
-      "name": "vault",
+      "name": "stakingPool",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultOwner",
-            "type": "publicKey"
-          },
-          {
-            "name": "vaultNumber",
+            "name": "halfLifeInDays",
             "type": "u64"
           },
           {
-            "name": "deposited",
+            "name": "deposits",
             "type": "u64"
           },
           {
-            "name": "denormalizedDebt",
+            "name": "startTime",
             "type": "u64"
           },
           {
-            "name": "collateralType",
-            "type": "string"
+            "name": "lastTransactionTime",
+            "type": "u64"
           },
           {
-            "name": "pdaSalt",
-            "type": "string"
+            "name": "hedgeRewardAccumulator",
+            "type": "u128"
           },
           {
-            "name": "bump",
-            "type": "u8"
+            "name": "ushFeeAccumulator",
+            "type": "u128"
           },
           {
-            "name": "vaultVersion",
+            "name": "totalHedgeReward",
             "type": "u64"
           },
           {
-            "name": "debtProductSnapshotBytes",
-            "type": "u128"
-          },
-          {
-            "name": "collateralAccumulatorSnapshotBytes",
-            "type": "u128"
+            "name": "stakedTokenMint",
+            "type": "publicKey"
           },
           {
-            "name": "debtType",
+            "name": "seedPhrase",
             "type": {
-              "defined": "CurrencyType"
+              "array": [
+                "u8",
+                12
+              ]
             }
           },
           {
-            "name": "vaultStatus",
+            "name": "collateralFeeAccumulator",
             "type": {
-              "defined": "VaultStatus"
+              "array": [
+                "u128",
+                32
+              ]
             }
           },
           {
-            "name": "timeCreated",
-            "type": "u64"
-          },
-          {
-            "name": "timeLastInteraction",
-            "type": "u64"
-          },
-          {
-            "name": "nextVaultToRedeem",
-            "type": {
-              "option": "publicKey"
-            }
+            "name": "bump",
+            "type": "u8"
           }
         ]
       }
@@ -4769,6 +4695,80 @@ export const IDL: Vault = {
           }
         ]
       }
+    },
+    {
+      "name": "vault",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "vaultOwner",
+            "type": "publicKey"
+          },
+          {
+            "name": "vaultNumber",
+            "type": "u64"
+          },
+          {
+            "name": "deposited",
+            "type": "u64"
+          },
+          {
+            "name": "denormalizedDebt",
+            "type": "u64"
+          },
+          {
+            "name": "collateralType",
+            "type": "string"
+          },
+          {
+            "name": "pdaSalt",
+            "type": "string"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "vaultVersion",
+            "type": "u64"
+          },
+          {
+            "name": "debtProductSnapshotBytes",
+            "type": "u128"
+          },
+          {
+            "name": "collateralAccumulatorSnapshotBytes",
+            "type": "u128"
+          },
+          {
+            "name": "debtType",
+            "type": {
+              "defined": "CurrencyType"
+            }
+          },
+          {
+            "name": "vaultStatus",
+            "type": {
+              "defined": "VaultStatus"
+            }
+          },
+          {
+            "name": "timeCreated",
+            "type": "u64"
+          },
+          {
+            "name": "timeLastInteraction",
+            "type": "u64"
+          },
+          {
+            "name": "nextVaultToRedeem",
+            "type": {
+              "option": "publicKey"
+            }
+          }
+        ]
+      }
     }
   ],
   "types": [

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