hedge-web3 0.1.9 → 0.1.13

package/src/instructions/withdrawStakingPool.ts

@@ -42,6 +42,7 @@ export async function withdrawStakingPoolInstruction (
   const payerAssociatedStakedTokenAccount = await findAssociatedTokenAddress(payerPublicKey, stakedTokenMintPublicKey)
   const payerAssociatedHedgeAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
   const payerAssociatedUsdhAccount = await findAssociatedTokenAddress(payerPublicKey, usdhMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey,hedgeMintPublickey)
 
   return program.instruction.withdrawStakingPool(
     new BN(overrideStartTime ?? Date.now() / 1000), // override current time
@@ -56,6 +57,7 @@ export async function withdrawStakingPoolInstruction (
         payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
         payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
         payerAssociatedUsdhAccount: payerAssociatedUsdhAccount,
+        communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
         hedgeMint: hedgeMintPublickey,
         stakedTokenMint: stakedTokenMintPublicKey,
         usdhMint: usdhMintPublickey,

package/src/instructions/withdrawVault.ts

@@ -1,15 +1,14 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, LAMPORTS_PER_SOL, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { CHAINLINK_SOL_USD_PUBLICKEY, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { getSolCollateralStateAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function withdrawVault (
   program: Program,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
-  withdrawAmount: number,
-  chainlinkOverridePrice?: number
+  withdrawAmount: number
 ): Promise<PublicKey> {
   const [usdhMintPublickey] = await getUsdhMintPublicKey()
   const USDH = new Token(
@@ -25,39 +24,37 @@ export async function withdrawVault (
   const history = Keypair.generate()
   const [vaultSystemStatePublicKey] = await getVaultSystemStatePublicKey()
   const transaction = new Transaction().add(
-    withdrawVaultInstruction(
+    await withdrawVaultInstruction(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
       vaultPublicKey,
       history.publicKey,
-      withdrawAmount,
-      chainlinkOverridePrice
+      withdrawAmount
     )
   )
   await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
   return vaultPublicKey
 }
 
-export function withdrawVaultInstruction (
+export async function withdrawVaultInstruction (
   program: Program,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   vaultPublickey: PublicKey,
   historyPublicKey: PublicKey,
-  withdrawAmount: number,
-  chainlinkOverridePrice?: number
-): TransactionInstruction {
+  withdrawAmount: number
+): Promise<TransactionInstruction> {
+  const collateralStateAccount = await getSolCollateralStateAccountPublicKey()
   return program.instruction.withdrawVault(
     new BN(withdrawAmount),
-    new BN(chainlinkOverridePrice ?? 200 * LAMPORTS_PER_SOL),
     {
       accounts: {
         vaultSystemState: vaultSystemStatePublicKey,
+        collateralStateAccount: collateralStateAccount,
         vaultAccount: vaultPublickey,
         history: historyPublicKey,
         vaultOwner: payerPublicKey,
-        chainlinkFeedAccount: CHAINLINK_SOL_USD_PUBLICKEY,
         systemProgram: SystemProgram.programId
       },
       signers: []

package/src/state/VaultAccount.ts

@@ -21,9 +21,6 @@ export class VaultAccount {
   /** The minimum collateral ratio this vault must maintain to not be subject to liquidation. */
   minCollateralRatio: Decimal
 
-  /** The SOL/USD price at which this vault is subject to liquidation */
-  liquidationPrice: number
-
   /** Current State of the vautl ("Open", "Closed", "Liquidated") */
   vaultStatus: string
 
@@ -33,7 +30,6 @@ export class VaultAccount {
     this.debt = vault.debt.toNumber()
     this.deposited = vault.deposited.toNumber()
     this.minCollateralRatio = DecimalFromU128(vault.minCollateralRatio)
-    this.liquidationPrice = vault.liquidationPrice.toNumber()
     this.vaultStatus = Object.keys(vault.vaultStatus)[0]
   }