hedge-web3 0.1.34 → 0.1.35

package/declarations/Constants.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const HEDGE_PROGRAM_ID = "HDG3uyafYaKxSYRW37ZBTdxaUCoyzaqbuirYucAeaPFY";
+export declare const HEDGE_PROGRAM_ID = "HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ";
 export declare const HEDGE_PROGRAM_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_SOL_USD_ID = "FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf";
 export declare const CHAINLINK_SOL_USD_PUBLICKEY: PublicKey;

package/declarations/instructions/claimStakingPoolPosition.d.ts

@@ -1,5 +1,5 @@
-import { Program } from '@project-serum/anchor';
+import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
-export declare function claimStakingPoolPosition(program: Program<Vault>, poolPosition: PublicKey, payer: Signer, collateralType: string): Promise<PublicKey>;
+export declare function claimStakingPoolPosition(program: Program<Vault>, provider: Provider, 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/lib/Constants.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAssociatedTokenAddress = exports.findVaultAddress = exports.getVaultTypeOracleAccountPublicKey = exports.getVaultTypeAccountPublicKey = exports.getPoolPublicKeyForMint = exports.getHedgeMintPublicKey = exports.getVaultSystemStatePublicKey = exports.getUshMintPublicKey = exports.getLiquidationPoolUshAccountPublicKey = exports.getLiquidationPoolStatePublicKey = exports.CHAINLINK_SOL_USD_PUBLICKEY = exports.CHAINLINK_SOL_USD_ID = exports.HEDGE_PROGRAM_PUBLICKEY = exports.HEDGE_PROGRAM_ID = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-exports.HEDGE_PROGRAM_ID = 'HDG3uyafYaKxSYRW37ZBTdxaUCoyzaqbuirYucAeaPFY';
+exports.HEDGE_PROGRAM_ID = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ';
 exports.HEDGE_PROGRAM_PUBLICKEY = new web3_js_1.PublicKey(exports.HEDGE_PROGRAM_ID);
 exports.CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf';
 exports.CHAINLINK_SOL_USD_PUBLICKEY = new web3_js_1.PublicKey(exports.CHAINLINK_SOL_USD_ID);

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, poolPosition, payer, collateralType) {
+function claimStakingPoolPosition(program, provider, 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)(program.provider.connection, payer, collateralMint, feePool, true);
-        const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(program.provider.connection, payer, collateralMint, payer.publicKey);
+        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 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)(program.provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return payerAssociatedTokenAccount.address;
     });
 }

package/lib/instructions/loanVault.js

@@ -15,6 +15,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
+const Errors_1 = require("utils/Errors");
 function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -27,7 +28,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, loanAmount, false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]).catch(Errors_1.parseAnchorErrors);
         return vaultPublicKey;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/Constants.ts

@@ -4,7 +4,7 @@ import {
 } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HDG3uyafYaKxSYRW37ZBTdxaUCoyzaqbuirYucAeaPFY'
+export const HEDGE_PROGRAM_ID = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID =

package/src/instructions/claimStakingPoolPosition.ts

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

package/src/instructions/loanVault.ts

@@ -19,6 +19,7 @@ import {
   getVaultSystemStatePublicKey,
 } from '../Constants'
 import { Vault } from 'idl/vault'
+import { parseAnchorErrors } from 'utils/Errors'
 
 export async function loanVault(
   program: Program<Vault>,
@@ -84,7 +85,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
   return vaultPublicKey
 }