hedge-web3 0.1.31 → 0.1.34

package/declarations/instructions/claimLiquidationPoolPosition.d.ts

@@ -2,4 +2,4 @@ import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
 export declare function claimLiquidationPoolPosition(program: Program<Vault>, provider: Provider, poolPosition: PublicKey, payer: Signer, collateralType: string, overrideStartTime?: number): Promise<PublicKey>;
-export declare function claimLiquidationPoolPositionInstruction(program: Program<Vault>, poolState: PublicKey, poolAssociatedTokenAccount: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, poolPosition: PublicKey, payer: PublicKey, payerAssociatedTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function claimLiquidationPoolPositionInstruction(program: Program<Vault>, vaultTypeAccount: PublicKey, collateralMint: PublicKey, poolPosition: PublicKey, payer: PublicKey, payerAssociatedTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/claimStakingPoolPosition.d.ts

@@ -1,5 +1,5 @@
-import { Program, Provider } from '@project-serum/anchor';
+import { Program } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
-export declare function claimStakingPoolPosition(program: Program<Vault>, provider: Provider, poolPosition: PublicKey, payer: Signer, collateralType: string): Promise<PublicKey>;
+export declare function claimStakingPoolPosition(program: Program<Vault>, poolPosition: PublicKey, payer: Signer, collateralType: string): Promise<PublicKey>;
 export declare function claimStakingPoolPositionInstruction(program: Program<Vault>, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, stakedTokenMint: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, poolPosition: PublicKey, payer: PublicKey, payerAssociatedTokenAccount: PublicKey): Promise<TransactionInstruction>;

package/declarations/instructions/refreshOraclePrice.d.ts

@@ -3,9 +3,8 @@ import { Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
 export declare function refreshOraclePrice(program: Program<Vault>, provider: Provider, payer: Signer, collateralType: string, network: Cluster, overridePrice?: number, overrideTime?: number): Promise<string>;
 export declare function refreshOraclePriceInstruction(program: Program<Vault>, collateralType: string, network: Cluster, overridePrice?: number, overrideTime?: number): Promise<TransactionInstruction>;
-declare enum Cluster {
+export declare enum Cluster {
     Testing = "Testing",
     Devnet = "Devnet",
     MainnetBeta = "MainnetBeta"
 }
-export {};

package/lib/instructions/claimLiquidationPoolPosition.js

@@ -19,21 +19,22 @@ function claimLiquidationPoolPosition(program, provider, poolPosition, payer, co
         const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const collateralMintPublicKey = vaultTypeAccountInfo.collateralMint;
-        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolStatePublicKey, collateralMintPublicKey);
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMintPublicKey, payer.publicKey);
-        const transaction = new web3_js_1.Transaction().add(yield claimLiquidationPoolPositionInstruction(program, poolStatePublicKey, poolAssociatedTokenAccount, vaultTypeAccountPublicKey, collateralMintPublicKey, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield claimLiquidationPoolPositionInstruction(program, vaultTypeAccountPublicKey, collateralMintPublicKey, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address, overrideStartTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return payerAssociatedTokenAccount.address;
     });
 }
 exports.claimLiquidationPoolPosition = claimLiquidationPoolPosition;
-function claimLiquidationPoolPositionInstruction(program, poolState, poolAssociatedTokenAccount, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount, overrideStartTime) {
+function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log("inside function");
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolStatePublicKey, collateralMint);
         return yield program.methods.claimLiquidationPoolPosition().accounts({
             vaultSystemState: vaultSystemState,
-            poolState: poolState,
+            poolState: poolStatePublicKey,
             poolAssociatedTokenAccount: poolAssociatedTokenAccount,
             vaultTypeAccount: vaultTypeAccount,
             collateralMint: collateralMint,

package/lib/instructions/claimStakingPoolPosition.js

@@ -14,17 +14,17 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
-function claimStakingPoolPosition(program, provider, poolPosition, payer, collateralType) {
+function claimStakingPoolPosition(program, poolPosition, payer, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccount);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
         const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(stakedTokenMint);
-        const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, feePool, true);
-        const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
+        const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(program.provider.connection, payer, collateralMint, feePool, true);
+        const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(program.provider.connection, payer, collateralMint, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount.address, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(program.provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return payerAssociatedTokenAccount.address;
     });
 }

package/lib/instructions/createVault.js

@@ -122,7 +122,7 @@ exports.buildCreateVaultTransaction = buildCreateVaultTransaction;
 function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccountPublicKey, vaultPublicKey, vaultAssociatedTokenAccount, feePool, feePoolAssociatedUshTokenAccount, vaultTypeAccount, collateralMint, historyPublicKey, ushMintPublickey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const ix = program.methods
+        return yield program.methods
             .createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({
@@ -143,7 +143,6 @@ function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccount
             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
         })
             .instruction();
-        return ix;
     });
 }
 exports.createVaultInstruction = createVaultInstruction;

package/lib/instructions/liquidateVault.js

@@ -48,7 +48,7 @@ function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedToken
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const liquidationPoolUshAccountPublickey = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
         const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
-        return program.methods
+        return yield program.methods
             .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({

package/lib/instructions/loanVault.js

@@ -39,7 +39,7 @@ function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPub
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.methods
+        return yield program.methods
             .loanVault(new anchor_1.BN(loanAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
             .accounts({

package/lib/instructions/refreshOraclePrice.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshOraclePriceInstruction = exports.refreshOraclePrice = void 0;
+exports.Cluster = exports.refreshOraclePriceInstruction = exports.refreshOraclePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
@@ -46,7 +46,7 @@ var Cluster;
     Cluster["Testing"] = "Testing";
     Cluster["Devnet"] = "Devnet";
     Cluster["MainnetBeta"] = "MainnetBeta";
-})(Cluster || (Cluster = {}));
+})(Cluster = exports.Cluster || (exports.Cluster = {}));
 const pythAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.31",
+  "version": "0.1.34",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -14,7 +14,7 @@
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "dependencies": {
-    "@project-serum/anchor": "^0.24.1",
+    "@project-serum/anchor": "^0.24.2",
     "@project-serum/serum": "^0.13.61",
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -30,8 +30,6 @@ export async function claimLiquidationPoolPosition(
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const collateralMintPublicKey = vaultTypeAccountInfo.collateralMint
 
-  const poolStatePublicKey = await getLiquidationPoolStatePublicKey()
-  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMintPublicKey)
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -42,8 +40,6 @@ export async function claimLiquidationPoolPosition(
   const transaction = new Transaction().add(
     await claimLiquidationPoolPositionInstruction(
       program,
-      poolStatePublicKey,
-      poolAssociatedTokenAccount,
       vaultTypeAccountPublicKey,
       collateralMintPublicKey,
       poolPosition,
@@ -58,8 +54,6 @@ export async function claimLiquidationPoolPosition(
 
 export async function claimLiquidationPoolPositionInstruction(
   program: Program<Vault>,
-  poolState: PublicKey,
-  poolAssociatedTokenAccount: PublicKey,
   vaultTypeAccount: PublicKey,
   collateralMint: PublicKey,
   poolPosition: PublicKey,
@@ -67,11 +61,15 @@ export async function claimLiquidationPoolPositionInstruction(
   payerAssociatedTokenAccount: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
+
+  console.log("inside function")
   const vaultSystemState = await getVaultSystemStatePublicKey()
+  const poolStatePublicKey = await getLiquidationPoolStatePublicKey()
+  const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMint)
 
   return await program.methods.claimLiquidationPoolPosition().accounts({
     vaultSystemState: vaultSystemState,
-    poolState: poolState,
+    poolState: poolStatePublicKey,
     poolAssociatedTokenAccount: poolAssociatedTokenAccount,
     vaultTypeAccount: vaultTypeAccount,
     collateralMint: collateralMint,

package/src/instructions/claimStakingPoolPosition.ts

@@ -21,7 +21,6 @@ import { Vault } from 'idl/vault'
 
 export async function claimStakingPoolPosition(
   program: Program<Vault>,
-  provider: Provider,
   poolPosition: PublicKey,
   payer: Signer,
   collateralType: string
@@ -32,14 +31,14 @@ export async function claimStakingPoolPosition(
   const stakedTokenMint = await getHedgeMintPublicKey()
   const [feePool] = await getPoolPublicKeyForMint(stakedTokenMint)
   const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
-    provider.connection,
+    program.provider.connection,
     payer,
     collateralMint,
     feePool,
     true
   )
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
-    provider.connection,
+    program.provider.connection,
     payer,
     collateralMint,
     payer.publicKey
@@ -58,7 +57,7 @@ export async function claimStakingPoolPosition(
       payerAssociatedTokenAccount.address
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(program.provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 

package/src/instructions/createVault.ts

@@ -225,7 +225,7 @@ export async function createVaultInstruction(
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
 
-  const ix = program.methods
+  return await program.methods
     .createVault(
       salt,
       new BN(depositAmount),
@@ -249,5 +249,4 @@ export async function createVaultInstruction(
       rent: SYSVAR_RENT_PUBKEY,
     })
     .instruction()
-  return ix
 }

package/src/instructions/liquidateVault.ts

@@ -154,7 +154,7 @@ export async function liquidateVaultInstruction(
   const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
   const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
-  return program.methods
+  return await program.methods
     .liquidateVault(
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )

package/src/instructions/loanVault.ts

@@ -112,7 +112,7 @@ export async function loanVaultInstruction(
     ushMintPublickey
   )
 
-  return program.methods
+  return await program.methods
     .loanVault(
       new BN(loanAmount),
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time

package/src/instructions/refreshOraclePrice.ts

@@ -59,7 +59,7 @@ export async function refreshOraclePriceInstruction(
     .instruction()
 }
 
-enum Cluster {
+export enum Cluster {
   Testing = 'Testing',
   Devnet = 'Devnet',
   MainnetBeta = 'MainnetBeta',

package/tsconfig.json

@@ -18,4 +18,4 @@
     "outDir": "./lib",
   },
   "include": ["src"]
-}
+}