hedge-web3 0.2.24 → 0.2.26

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -16,29 +16,29 @@ exports.closeLiquidationPoolPositionInstruction = exports.closeLiquidationPoolPo
 const anchor_1 = require("@project-serum/anchor");
 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");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function closeLiquidationPoolPosition(program, provider, poolPosition, payer, overrideStartTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
         const liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
-        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
         const payerAssociatedHedgeAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, payer.publicKey);
         const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true);
         let referralAccountPublicKey = null;
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUshAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, userReferralAccountPublicKey, referralAccountPublicKey, referralStatePublicKey, overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition;
@@ -47,11 +47,11 @@ function closeLiquidationPoolPosition(program, provider, poolPosition, payer, ov
 exports.closeLiquidationPoolPosition = closeLiquidationPoolPosition;
 function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payerPublicKey, payerUshAccount, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, userReferralAccountPublicKey, referralAccountPublicKey, referralStatePublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
-        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
-        const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMint = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
         return yield program.methods
             .closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )

package/lib/instructions/createReferralAccount.js

@@ -30,25 +30,25 @@ const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfi
  * - poolPublicKey: PublicKey : a key to a pool position. If the position is closed or does not belong to the signer it will be ignored
  * - referrer: PublicKey
  * - overrideTime?: number
-*/
+ */
 function createReferralAccount(program, provider, payer, poolPosition, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        // setup transaction  
+        // setup transaction
         const transaction = new web3_js_1.Transaction();
         const signers = [payer];
         const referrer = payer.publicKey;
         // Setup public keys
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         // Find referral account
-        let referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        let referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         // Get the referral state PDA
-        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
         // Get HDG mint public key
-        const hedgeMintPublicKey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const hedgeMintPublicKey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
         // Get HDG account of signer
         const payerHdgAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMintPublicKey, payer.publicKey);
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         transaction.add(yield createReferralAccountInstruction(program, payer.publicKey, poolPosition, referralAccountPublicKey, referallStatePublicKey, hedgeMintPublicKey, payerHdgAssociatedTokenAccount.address, userReferralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
         return referralAccountPublicKey;
@@ -57,7 +57,7 @@ function createReferralAccount(program, provider, payer, poolPosition, overrideT
 exports.createReferralAccount = createReferralAccount;
 function createReferralAccountInstruction(program, payerPublicKey, poolPositionPublicKey, referralAccountPublicKey, referralStatePublicKey, hedgeMintPublicKey, hdgAssociatedTokenAccountPublicKey, userReferralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .createReferralAccount(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override times
         )

package/lib/instructions/createStakingPool.js

@@ -16,25 +16,25 @@ exports.createStakingPoolInstruction = exports.createStakingPool = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function createStakingPool(program, provider, payer, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const transaction = new web3_js_1.Transaction().add(yield createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
-        const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
+        const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, mintPublicKey);
         return poolPublickey;
     });
 }
 exports.createStakingPool = createStakingPool;
 function createStakingPoolInstruction(program, payerPublicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
-        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, mintPublicKey);
-        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, ushMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, mintPublicKey);
+        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, mintPublicKey);
+        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, ushMintPublickey);
         return yield program.methods
             .createStakingPool(poolBump, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)))
             .accounts({

package/lib/instructions/createUserReferralAccount.js

@@ -21,20 +21,20 @@ const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function createUserReferralAccount(program, provider, payer, referrer, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        // setup transaction  
+        // setup transaction
         const transaction = new web3_js_1.Transaction();
         const signers = [payer];
         // Find referrer account
         let referralAccountPublicKey = null;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         transaction.add(yield createUserReferralAccountInstruction(program, payer.publicKey, referralAccountPublicKey, userReferralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
         return userReferralAccountPublicKey;
@@ -43,7 +43,7 @@ function createUserReferralAccount(program, provider, payer, referrer, overrideT
 exports.createUserReferralAccount = createUserReferralAccount;
 function createUserReferralAccountInstruction(program, payerPublicKey, referralAccount, userReferralAccount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .createUserReferralAccount(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )

package/lib/instructions/createVault.js

@@ -23,22 +23,22 @@ const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function createVault(program, provider, payer, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         const salt = (0, uuid_1.v4)().substring(0, 8);
-        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(salt);
+        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(program.programId, salt);
         const history = web3_js_1.Keypair.generate();
         // Prep the user to get USH back out at some point
         yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
-        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
-        const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payer.publicKey, vaultTypeAccountInfo.collateralMint);
-        const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
+        const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payer.publicKey, vaultTypeAccountInfo.collateralMint);
+        const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const wrappedSolAccount = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
         const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
+        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         if (isWrappedSol) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
@@ -69,11 +69,11 @@ exports.createVault = createVault;
 function buildCreateVaultTransaction(program, payerPublicKey, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('HEDGE SDK: buildCreateVaultTransaction');
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         const salt = (0, uuid_1.v4)().substring(0, 8);
-        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(salt);
+        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(program.programId, salt);
         const history = web3_js_1.Keypair.generate();
-        const { blockhash } = yield program.provider.connection.getLatestBlockhash();
+        const { blockhash, lastValidBlockHeight } = yield program.provider.connection.getLatestBlockhash();
         const transaction = new web3_js_1.Transaction({
             feePayer: payerPublicKey,
             recentBlockhash: blockhash,
@@ -82,15 +82,15 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
         const wrappedSolAccount = web3_js_1.Keypair.generate();
         console.log('Lookup getVaultTypeAccountPublicKey', collateralType);
         // Lookup the vault type info
-        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         console.log('Lookup vaultTypeAccountPublicKey', vaultTypeAccountPublicKey.toString());
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         console.log('Lookup vaultTypeAccountInfo', vaultTypeAccountInfo);
         const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
-        const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, vaultTypeAccountInfo.collateralMint);
-        const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, vaultTypeAccountInfo.collateralMint);
+        const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
+        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         console.log('about to start building transaction');
         // If wrapped SOL collateral, we convert the SOL to wSOL to use in the instruction
         if (isWrappedSol) {
@@ -125,7 +125,7 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
 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 vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         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
         )

package/lib/instructions/depositLiquidationPool.js

@@ -16,23 +16,23 @@ exports.depositLiquidationPoolInstruction = exports.depositLiquidationPool = voi
 const anchor_1 = require("@project-serum/anchor");
 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");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function depositLiquidationPool(program, provider, payer, depositAmount, overrideStartTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         let referralAccountPublicKey = null;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, vaultSystemStatePublicKey, payerUshAccount.address, poolPosition.publicKey, new anchor_1.BN(depositAmount), userReferralAccountPublicKey, referralAccountPublicKey, overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
@@ -42,10 +42,10 @@ function depositLiquidationPool(program, provider, payer, depositAmount, overrid
 exports.depositLiquidationPool = depositLiquidationPool;
 function depositLiquidationPoolInstruction(program, payerPublicKey, vaultSystemStatePublicKey, payerUshAccount, poolPositionPublicKey, depositAmount, userReferralAccountPublicKey, referralAccountPublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
         const liquidationPoolState = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
-        const poolUSHAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
-        const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
+        const poolUSHAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const ushMint = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         return yield program.methods
             .depositLiquidationPool(depositAmount, new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )

package/lib/instructions/depositStakingPool.js

@@ -16,8 +16,8 @@ exports.depositStakingPoolInstruction = exports.depositStakingPool = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function depositStakingPool(program, provider, payer, mintPublicKey, depositAmount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -30,10 +30,10 @@ function depositStakingPool(program, provider, payer, mintPublicKey, depositAmou
 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)(stakedTokenMintPublicKey);
-        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, stakedTokenMintPublicKey);
-        const payersArbitraryTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, stakedTokenMintPublicKey);
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        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);
         return yield program.methods
             .depositStakingPool(depositAmount, new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )

package/lib/instructions/depositVault.js

@@ -15,27 +15,27 @@ 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");
 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 getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
-const token_instructions_1 = require("@project-serum/serum/lib/token-instructions");
 function depositVault(program, provider, payer, vaultPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_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)(payer.publicKey, vaultTypeAccountInfo.collateralMint);
-        const vaultAssociatedCollateralAccountPublicKey = yield (0, Constants_1.findAssociatedTokenAddress)(vaultPublicKey, vaultTypeAccountInfo.collateralMint);
+        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 history = web3_js_1.Keypair.generate();
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         const wrappedSolAccount = web3_js_1.Keypair.generate();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        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 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);
@@ -53,7 +53,9 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_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));
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_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,

package/lib/instructions/initHedgeFoundation.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initHedgeFoundationInstruction = exports.initHedgeFoundation = void 0;
 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");
+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* () {
@@ -29,13 +29,13 @@ function initHedgeFoundation(program, provider, payer) {
 exports.initHedgeFoundation = initHedgeFoundation;
 function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const poolStatePublickey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        const poolUshTokenAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
+        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);
         return yield program.methods
             .initHedgeFoundation()
             .accounts({

package/lib/instructions/initHedgeFoundationTokens.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initHedgeFoundationTokensInstruction = exports.initHedgeFoundationTokens = void 0;
 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");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function initHedgeFoundationTokens(program, provider, payer) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -29,10 +29,10 @@ function initHedgeFoundationTokens(program, provider, payer) {
 exports.initHedgeFoundationTokens = initHedgeFoundationTokens;
 function initHedgeFoundationTokensInstruction(program, payerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
+        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);
         return yield program.methods
             .initHedgeFoundationTokens()
             .accounts({

package/lib/instructions/liquidateVault.js

@@ -16,18 +16,18 @@ exports.liquidateVaultInstruction = exports.liquidateVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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 getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         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)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
-        const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        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 poolStateInfo = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
         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);
@@ -47,9 +47,9 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
 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)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const liquidationPoolUshAccountPublickey = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
+        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);
         return yield program.methods
             .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )

package/lib/instructions/loanVault.js

@@ -16,12 +16,12 @@ exports.loanVaultInstruction = exports.loanVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
 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 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 ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_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);
@@ -29,12 +29,12 @@ 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)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         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, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), referralAccountPublicKey, overrideTime));
@@ -45,13 +45,13 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
 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)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payerPublicKey);
+        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);
         return yield program.methods
             .loanVault(loanAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )

package/lib/instructions/psmEditAccount.js

@@ -27,11 +27,11 @@ var psmStatus;
 })(psmStatus = exports.psmStatus || (exports.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)();
+        const ushMintPublickey = yield (0, Constants_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')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([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]);
@@ -41,9 +41,9 @@ function psmEditAccount(program, provider, payer, collateralMint, mintFee, redee
 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)();
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
+        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);
         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
         )