hedge-web3 0.2.33 → 0.3.2

package/lib/instructions/depositStakingPool.js

@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depositStakingPoolInstruction = exports.depositStakingPool = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.depositStakingPool = depositStakingPool;
+exports.depositStakingPoolInstruction = depositStakingPoolInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function depositStakingPool(program, provider, payer, mintPublicKey, depositAmount, overrideStartTime) {
@@ -27,13 +28,12 @@ function depositStakingPool(program, provider, payer, mintPublicKey, depositAmou
         return poolPosition.publicKey;
     });
 }
-exports.depositStakingPool = depositStakingPool;
 function depositStakingPoolInstruction(program, payerPublicKey, poolPositionPublicKey, stakedTokenMintPublicKey, depositAmount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
-        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, stakedTokenMintPublicKey);
-        const payersArbitraryTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, stakedTokenMintPublicKey);
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const [poolPublickey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
+        const poolAssociatedStakedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, stakedTokenMintPublicKey);
+        const payersArbitraryTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, stakedTokenMintPublicKey);
+        const vaultSystemState = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .depositStakingPool(depositAmount, new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )
@@ -51,4 +51,3 @@ function depositStakingPoolInstruction(program, payerPublicKey, poolPositionPubl
             .instruction();
     });
 }
-exports.depositStakingPoolInstruction = depositStakingPoolInstruction;

package/lib/instructions/depositVault.js

@@ -12,62 +12,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depositVaultInstruction = exports.depositVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
-const serum_1 = require("@project-serum/serum");
-const token_instructions_1 = require("@project-serum/serum/lib/token-instructions");
+exports.depositVault = depositVault;
+exports.depositVaultInstruction = depositVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function depositVault(program, provider, payer, vaultPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         // Prep the user to get USH back out at some point
         yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
-        const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payer.publicKey, vaultTypeAccountInfo.collateralMint);
-        const vaultAssociatedCollateralAccountPublicKey = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultPublicKey, vaultTypeAccountInfo.collateralMint);
+        const payerTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payer.publicKey, vaultTypeAccountInfo.collateralMint);
+        const vaultAssociatedCollateralAccountPublicKey = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const history = web3_js_1.Keypair.generate();
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         const wrappedSolAccount = web3_js_1.Keypair.generate();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(depositAmount), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
+        if (vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
                 lamports: depositAmount + 2.04e6,
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
                 space: 165,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey,
-            }));
+            }), (0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payer.publicKey));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()
             ? wrappedSolAccount.publicKey
             : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(depositAmount), overrideTime));
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payer.publicKey,
-                owner: payer.publicKey,
-            }));
+        if (vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
+            transaction.add((0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payer.publicKey, payer.publicKey, []));
         }
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers);
         return vaultPublicKey;
     });
 }
-exports.depositVault = depositVault;
 function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
@@ -95,4 +85,3 @@ function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner,
             .instruction();
     });
 }
-exports.depositVaultInstruction = depositVaultInstruction;

package/lib/instructions/initHedgeFoundation.js

@@ -12,30 +12,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initHedgeFoundationInstruction = exports.initHedgeFoundation = void 0;
+exports.initHedgeFoundation = initHedgeFoundation;
+exports.initHedgeFoundationInstruction = initHedgeFoundationInstruction;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function initHedgeFoundation(program, provider, payer) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log('Initializing Hedge Foundation...');
         const poolEra = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey));
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolEra]).catch(Errors_1.parseAnchorErrors);
+        console.log('Generated poolEra:', poolEra.publicKey.toBase58());
+        const transaction = new web3_js_1.Transaction();
+        transaction.feePayer = payer.publicKey;
+        transaction.add(yield initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey));
+        console.log('Created transaction with initHedgeFoundationInstruction');
+        console.log('Payer public key:', payer.publicKey.toBase58());
+        console.log('Sending transaction...');
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolEra])
+            .catch(err => {
+            console.error('Failed to initialize Hedge Foundation:', err);
+            throw (0, Errors_1.parseAnchorErrors)(err);
+        });
+        console.log('Successfully initialized Hedge Foundation');
         return payer.publicKey;
     });
 }
-exports.initHedgeFoundation = initHedgeFoundation;
 function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const poolStatePublickey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
-        const poolUshTokenAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const poolStatePublickey = yield (0, HedgeConstants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const poolUshTokenAccount = yield (0, HedgeConstants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const founderHedgeTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
+        const communityHedgeTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
         return yield program.methods
             .initHedgeFoundation()
             .accounts({
@@ -54,4 +66,3 @@ function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKe
             .instruction();
     });
 }
-exports.initHedgeFoundationInstruction = initHedgeFoundationInstruction;

package/lib/instructions/initHedgeFoundationTokens.js

@@ -12,10 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initHedgeFoundationTokensInstruction = exports.initHedgeFoundationTokens = void 0;
+exports.initHedgeFoundationTokens = initHedgeFoundationTokens;
+exports.initHedgeFoundationTokensInstruction = initHedgeFoundationTokensInstruction;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function initHedgeFoundationTokens(program, provider, payer) {
@@ -26,13 +27,12 @@ function initHedgeFoundationTokens(program, provider, payer) {
         return payer.publicKey;
     });
 }
-exports.initHedgeFoundationTokens = initHedgeFoundationTokens;
 function initHedgeFoundationTokensInstruction(program, payerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const founderHedgeTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
+        const communityHedgeTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
         return yield program.methods
             .initHedgeFoundationTokens()
             .accounts({
@@ -49,4 +49,3 @@ function initHedgeFoundationTokensInstruction(program, payerPublicKey) {
             .instruction();
     });
 }
-exports.initHedgeFoundationTokensInstruction = initHedgeFoundationTokensInstruction;

package/lib/instructions/liquidateVault.js

@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquidateVaultInstruction = exports.liquidateVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.liquidateVault = liquidateVault;
+exports.liquidateVaultInstruction = liquidateVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime) {
@@ -24,15 +25,11 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
-        const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const liquidationPoolStatePublicKey = yield (0, HedgeConstants_1.getLiquidationPoolStatePublicKey)(program.programId);
         const poolStateInfo = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
-        const additionalComputationBudget = web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: 300000,
-            additionalFee: 0,
-        });
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey, true);
         const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, hedgeStakingPoolPublicKey, true);
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, vaultPublicKey, true);
@@ -43,19 +40,16 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const history = web3_js_1.Keypair.generate();
         const newEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();
-        transaction
-            .add(additionalComputationBudget)
-            .add(yield liquidateVaultInstruction(program, payer.publicKey, payerAssociatedTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, liquidationPoolStatePublicKey, poolStateInfo.currentEra, poolAssociatedTokenAccount.address, history.publicKey, newEra.publicKey, hedgeStakingPoolPublicKey, feePoolAssociatedTokenAccount.address, hedgeStakingPoolAssociatedUshTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultAccount.vaultType, overrideTime));
+        transaction.add(yield liquidateVaultInstruction(program, payer.publicKey, payerAssociatedTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, liquidationPoolStatePublicKey, poolStateInfo.currentEra, poolAssociatedTokenAccount.address, history.publicKey, newEra.publicKey, hedgeStakingPoolPublicKey, feePoolAssociatedTokenAccount.address, hedgeStakingPoolAssociatedUshTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultAccount.vaultType, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history, newEra]);
         return vaultPublicKey;
     });
 }
-exports.liquidateVault = liquidateVault;
 function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedTokenAccount, vaultPublickey, vaultAssociatedTokenAccount, poolState, poolEra, poolAssociatedTokenAccount, historyPublicKey, newEraPublicKey, feePool, feePoolAssociatedTokenAccount, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultTypeAccount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const liquidationPoolUshAccountPublickey = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const liquidationPoolUshAccountPublickey = yield (0, HedgeConstants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
         return yield program.methods
             .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -89,4 +83,3 @@ function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedToken
             .instruction();
     });
 }
-exports.liquidateVaultInstruction = liquidateVaultInstruction;

package/lib/instructions/loanVault.js

@@ -12,20 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loanVaultInstruction = exports.loanVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.loanVault = loanVault;
+exports.loanVaultInstruction = loanVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const additionalComputationBudget = web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: 300000,
-            additionalFee: 0,
-        });
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
@@ -33,31 +30,28 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultPublicKey, true);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(loanAmount), new anchor_1.BN(0), false, false);
         let referralAccountPublicKey = null;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         const history = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction()
-            .add(additionalComputationBudget)
-            .add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), referralAccountPublicKey, overrideTime));
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
+        const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), referralAccountPublicKey, overrideTime));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history], 300000);
         return vaultPublicKey;
     });
 }
-exports.loanVault = loanVault;
 function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, referralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payerPublicKey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const referralStatePublicKey = yield (0, HedgeConstants_1.getReferralStatePublicKey)(program.programId);
+        const userReferralAccountPublicKey = yield (0, HedgeConstants_1.getUserReferralAccountPublicKey)(program.programId, payerPublicKey);
         return yield program.methods
             .loanVault(loanAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -85,4 +79,3 @@ function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPub
             .instruction();
     });
 }
-exports.loanVaultInstruction = loanVaultInstruction;

package/lib/instructions/psmEditAccount.js

@@ -12,11 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.psmEditAccountInstruction = exports.psmEditAccount = exports.psmStatus = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.psmStatus = void 0;
+exports.psmEditAccount = psmEditAccount;
+exports.psmEditAccountInstruction = psmEditAccountInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 var psmStatus;
 (function (psmStatus) {
@@ -24,26 +26,25 @@ var psmStatus;
     psmStatus[psmStatus["PsmDisabled"] = 1] = "PsmDisabled";
     psmStatus[psmStatus["MintOnly"] = 2] = "MintOnly";
     psmStatus[psmStatus["RedeemOnly"] = 3] = "RedeemOnly";
-})(psmStatus = exports.psmStatus || (exports.psmStatus = {}));
+})(psmStatus || (exports.psmStatus = psmStatus = {}));
 function psmEditAccount(program, provider, payer, collateralMint, mintFee, redeemFee, debtLimit, minSwap, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const payerCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const enc = new TextEncoder();
-        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddressSync([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
         const psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
         const transaction = new web3_js_1.Transaction().add(yield psmEditAccountInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(mintFee), new anchor_1.BN(redeemFee), new anchor_1.BN(debtLimit), new anchor_1.BN(minSwap), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return payer.publicKey;
     });
 }
-exports.psmEditAccount = psmEditAccount;
 function psmEditAccountInstruction(program, payerPublicKey, psmAccount, collateralMint, mintFee, redeemFee, debtLimit, minSwap, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
         return yield program.methods
             .psmEditAccount(mintFee, redeemFee, debtLimit, minSwap, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -57,4 +58,3 @@ function psmEditAccountInstruction(program, payerPublicKey, psmAccount, collater
             .instruction();
     });
 }
-exports.psmEditAccountInstruction = psmEditAccountInstruction;

package/lib/instructions/psmMintUsh.js

@@ -12,45 +12,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.psmMintUshInstruction = exports.psmMintUsh = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.psmMintUsh = psmMintUsh;
+exports.psmMintUshInstruction = psmMintUshInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function psmMintUsh(program, provider, payer, collateralMint, collateralAmount, overrideTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const payerCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const enc = new TextEncoder();
-        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddressSync([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
         const psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
         let referralAccountPublicKey;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         if (!referrer) {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
+        const referralStatePublicKey = yield (0, HedgeConstants_1.getReferralStatePublicKey)(program.programId);
         const transaction = new web3_js_1.Transaction().add(yield psmMintUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(collateralAmount), referralStatePublicKey, referralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return payer.publicKey;
     });
 }
-exports.psmMintUsh = psmMintUsh;
 function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMint, collateralAmount, referralStatePublicKey, referralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
-        const psmAccountAta = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, psmAccount, collateralMint);
-        const ownerCollateralAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, collateralMint);
-        const ownerUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const psmAccountAta = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, psmAccount, collateralMint);
+        const ownerCollateralAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, collateralMint);
+        const ownerUshAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
         return yield program.methods
             .psmMintUsh(collateralAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -73,4 +73,3 @@ function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMi
             .instruction();
     });
 }
-exports.psmMintUshInstruction = psmMintUshInstruction;

package/lib/instructions/psmRedeemUsh.js

@@ -12,45 +12,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.psmRedeemUshInstruction = exports.psmRedeemUsh = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.psmRedeemUsh = psmRedeemUsh;
+exports.psmRedeemUshInstruction = psmRedeemUshInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function psmRedeemUsh(program, provider, payer, collateralMint, ushAmount, overrideTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const payerCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const enc = new TextEncoder();
-        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddressSync([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], program.programId);
         const psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
         let referralAccountPublicKey;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         if (!referrer) {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
+        const referralStatePublicKey = yield (0, HedgeConstants_1.getReferralStatePublicKey)(program.programId);
         const transaction = new web3_js_1.Transaction().add(yield psmRedeemUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(ushAmount), referralStatePublicKey, referralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return payer.publicKey;
     });
 }
-exports.psmRedeemUsh = psmRedeemUsh;
 function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateralMint, ushAmount, referralStatePublicKey, referralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
-        const psmAccountAta = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, psmAccount, collateralMint);
-        const ownerCollateralAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, collateralMint);
-        const ownerUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const psmAccountAta = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, psmAccount, collateralMint);
+        const ownerCollateralAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, collateralMint);
+        const ownerUshAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
         return yield program.methods
             .psmRedeemUsh(ushAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -73,4 +73,3 @@ function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateral
             .instruction();
     });
 }
-exports.psmRedeemUshInstruction = psmRedeemUshInstruction;