hedge-web3 0.2.21 → 0.2.25

package/lib/index.js

@@ -10,36 +10,42 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./instructions/createStakingPool"), exports);
-__exportStar(require("./instructions/depositStakingPool"), exports);
-__exportStar(require("./instructions/withdrawStakingPool"), exports);
-__exportStar(require("./instructions/claimStakingPoolPosition"), exports);
-__exportStar(require("./instructions/depositLiquidationPool"), exports);
-__exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
+__exportStar(require("./Constants"), exports);
+__exportStar(require("./HedgeDecimal"), exports);
+__exportStar(require("./idl/vault"), exports);
 __exportStar(require("./instructions/claimLiquidationPoolPosition"), exports);
+__exportStar(require("./instructions/claimStakingPoolPosition"), exports);
 __exportStar(require("./instructions/closeClaimedLiquidationPoolPosition"), exports);
+__exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
+__exportStar(require("./instructions/createReferralAccount"), exports);
+__exportStar(require("./instructions/createStakingPool"), exports);
+__exportStar(require("./instructions/createUserReferralAccount"), exports);
 __exportStar(require("./instructions/createVault"), exports);
-__exportStar(require("./instructions/psmMintUsh"), exports);
-__exportStar(require("./instructions/psmRedeemUsh"), exports);
+__exportStar(require("./instructions/depositLiquidationPool"), exports);
+__exportStar(require("./instructions/depositStakingPool"), exports);
 __exportStar(require("./instructions/depositVault"), exports);
-__exportStar(require("./instructions/withdrawVault"), exports);
+__exportStar(require("./instructions/initHedgeFoundation"), exports);
+__exportStar(require("./instructions/initHedgeFoundationTokens"), exports);
+__exportStar(require("./instructions/liquidateVault"), exports);
 __exportStar(require("./instructions/loanVault"), exports);
-__exportStar(require("./instructions/repayVault"), exports);
+__exportStar(require("./instructions/psmMintUsh"), exports);
+__exportStar(require("./instructions/psmRedeemUsh"), exports);
 __exportStar(require("./instructions/redeemVault"), exports);
-__exportStar(require("./instructions/liquidateVault"), exports);
+__exportStar(require("./instructions/referralClaimFees"), exports);
 __exportStar(require("./instructions/refreshOraclePrice"), exports);
-__exportStar(require("./instructions/initHedgeFoundation"), exports);
-__exportStar(require("./instructions/initHedgeFoundationTokens"), exports);
+__exportStar(require("./instructions/repayVault"), exports);
 __exportStar(require("./instructions/setHalted"), exports);
+__exportStar(require("./instructions/transferVault"), exports);
+__exportStar(require("./instructions/updateReferralAccount"), exports);
+__exportStar(require("./instructions/updateReferralState"), exports);
 __exportStar(require("./instructions/updateVaultType"), exports);
-__exportStar(require("./HedgeDecimal"), exports);
-__exportStar(require("./Constants"), exports);
-__exportStar(require("./state/VaultAccount"), exports);
-__exportStar(require("./state/VaultHistoryEvent"), exports);
-__exportStar(require("./state/StakingPool"), exports);
-__exportStar(require("./state/StakingPoolPosition"), exports);
+__exportStar(require("./instructions/withdrawStakingPool"), exports);
+__exportStar(require("./instructions/withdrawVault"), exports);
 __exportStar(require("./state/LiquidationPoolEra"), exports);
 __exportStar(require("./state/LiquidationPoolState"), exports);
 __exportStar(require("./state/LiquidationPosition"), exports);
+__exportStar(require("./state/StakingPool"), exports);
+__exportStar(require("./state/StakingPoolPosition"), exports);
+__exportStar(require("./state/VaultAccount"), exports);
+__exportStar(require("./state/VaultHistoryEvent"), exports);
 __exportStar(require("./utils/getLinkedListAccounts"), exports);
-__exportStar(require("./idl/vault"), exports);

package/lib/instructions/claimLiquidationPoolPosition.js

@@ -15,12 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimLiquidationPoolPositionInstruction = exports.claimLiquidationPoolPosition = 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 claimLiquidationPoolPosition(program, provider, poolPosition, payer, collateralType, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        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 collateralMintPublicKey = vaultTypeAccountInfo.collateralMint;
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMintPublicKey, payer.publicKey);
@@ -32,10 +32,12 @@ function claimLiquidationPoolPosition(program, provider, poolPosition, payer, co
 exports.claimLiquidationPoolPosition = claimLiquidationPoolPosition;
 function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolStatePublicKey, collateralMint);
-        return yield program.methods.claimLiquidationPoolPosition().accounts({
+        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolStatePublicKey, collateralMint);
+        return yield program.methods
+            .claimLiquidationPoolPosition()
+            .accounts({
             vaultSystemState: vaultSystemState,
             poolState: poolStatePublicKey,
             poolAssociatedTokenAccount: poolAssociatedTokenAccount,
@@ -48,7 +50,8 @@ function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, coll
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,
             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-        }).instruction();
+        })
+            .instruction();
     });
 }
 exports.claimLiquidationPoolPositionInstruction = claimLiquidationPoolPositionInstruction;

package/lib/instructions/claimStakingPoolPosition.js

@@ -15,16 +15,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimStakingPoolPositionInstruction = exports.claimStakingPoolPosition = 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 claimStakingPoolPosition(program, provider, poolPosition, payer, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccount);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
-        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(stakedTokenMint);
+        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMint);
         const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, feePool, true);
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount.address, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address));
@@ -35,7 +35,7 @@ function claimStakingPoolPosition(program, provider, poolPosition, payer, collat
 exports.claimStakingPoolPosition = claimStakingPoolPosition;
 function claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .claimStakingPoolPosition()
             .accounts({

package/lib/instructions/closeClaimedLiquidationPoolPosition.js

@@ -30,7 +30,7 @@ function closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, p
             .closeClaimedLiquidationPoolPosition()
             .accounts({
             poolPosition: poolPosition,
-            payer: payer
+            payer: payer,
         })
             .instruction();
     });

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -16,32 +16,42 @@ 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) {
+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 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);
-        const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUshAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
+        let referralAccountPublicKey = null;
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        }
+        // Derive the user referral account public key
+        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;
     });
 }
 exports.closeLiquidationPoolPosition = closeLiquidationPoolPosition;
-function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payerPublicKey, payerUshAccount, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, overrideStartTime) {
+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
         )
@@ -57,6 +67,9 @@ function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition,
             ushMint: ushMint,
             payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
             communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
+            userReferralAccount: userReferralAccountPublicKey,
+            referralAccount: referralAccountPublicKey,
+            referralState: referralStatePublicKey,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,

package/lib/instructions/createReferralAccount.js

@@ -0,0 +1,80 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReferralAccountInstruction = exports.createReferralAccount = 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 Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+/** @type {Function}  - Creates a new referral account.
+ * This checks the user has enough HDG in their wallet or staked and
+ * then allows them to create a referral account. If they meet the PSM referral threshold,
+ * they will be eligible for PSM cut.
+ * Params:
+ * - program: Program<Vault> : The program instance of Hedge Vault program
+ * - provider: Provider : Current connection
+ * - payer: Signer : who we are creating the referral account for
+ * - 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
+        const transaction = new web3_js_1.Transaction();
+        const signers = [payer];
+        const referrer = payer.publicKey;
+        // Setup public keys
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        // Find referral account
+        let referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        // Get the referral state PDA
+        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
+        // Get HDG mint public key
+        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)(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;
+    });
+}
+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)(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
+        )
+            .accounts({
+            signer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            referralState: referralStatePublicKey,
+            referralAccount: referralAccountPublicKey,
+            userReferralAccount: userReferralAccountPublicKey,
+            poolPosition: poolPositionPublicKey,
+            hedgeMint: hedgeMintPublicKey,
+            hdgAta: hdgAssociatedTokenAccountPublicKey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
+    });
+}
+exports.createReferralAccountInstruction = createReferralAccountInstruction;

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

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUserReferralAccountInstruction = exports.createUserReferralAccount = 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 Constants_1 = require("../Constants");
+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
+        const transaction = new web3_js_1.Transaction();
+        const signers = [payer];
+        // Find referrer account
+        let referralAccountPublicKey = null;
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        }
+        // Derive the user referral account public key
+        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;
+    });
+}
+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)(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
+        )
+            .accounts({
+            signer: payerPublicKey,
+            userReferralAccount: userReferralAccount,
+            referralAccount: referralAccount,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
+    });
+}
+exports.createUserReferralAccountInstruction = createUserReferralAccountInstruction;

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,9 +69,9 @@ 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 transaction = new web3_js_1.Transaction({
@@ -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,32 +16,41 @@ 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) {
+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)(program.programId);
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        }
+        // Derive the user referral account public key
+        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, payerUshAccount.address, poolPosition.publicKey, new anchor_1.BN(depositAmount), overrideStartTime));
+        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);
         return poolPosition.publicKey;
     });
 }
 exports.depositLiquidationPool = depositLiquidationPool;
-function depositLiquidationPoolInstruction(program, payerPublicKey, payerUshAccount, poolPositionPublicKey, depositAmount, overrideStartTime) {
+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 vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        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
         )
             .accounts({
-            vaultSystemState: vaultSystemState,
+            vaultSystemState: vaultSystemStatePublicKey,
             poolState: liquidationPoolStatePublicKey,
             poolUshAccount: poolUSHAccount,
             poolEra: liquidationPoolState.currentEra,
@@ -49,6 +58,8 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, payerUshAcco
             ushMint: ushMint,
             payer: payerPublicKey,
             ownerUshAccount: payerUshAccount,
+            userReferralAccount: userReferralAccountPublicKey,
+            referralAccount: referralAccountPublicKey,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,
         })

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,