hedge-web3 0.2.20 → 0.2.24

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/closeLiquidationPoolPosition.js

@@ -19,23 +19,33 @@ const web3_js_1 = require("@solana/web3.js");
 const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
 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 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 liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
         const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
         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)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        }
+        // Derive the user referral account public key
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(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)();
@@ -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)();
+        // Find referral account
+        let referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        // Get the referral state PDA
+        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        // Get HDG mint public key
+        const hedgeMintPublicKey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        // 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);
+        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)();
+        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/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)();
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        }
+        // Derive the user referral account public key
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(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)();
+        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/depositLiquidationPool.js

@@ -19,29 +19,38 @@ const web3_js_1 = require("@solana/web3.js");
 const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
 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 payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
+        let referralAccountPublicKey = null;
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        }
+        // Derive the user referral account public key
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(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 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)();
         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/loanVault.js

@@ -19,7 +19,7 @@ const web3_js_1 = require("@solana/web3.js");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
-function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime) {
+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 payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
@@ -28,20 +28,30 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultAccount.vaultType, true);
         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)();
+        if (typeof referrer === 'undefined') {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(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), overrideTime));
+        const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), referralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
 exports.loanVault = loanVault;
-function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime) {
+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);
         return yield program.methods
             .loanVault(loanAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -60,6 +70,9 @@ function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPub
             oldSmallerVaultInfo: oldSmallerPublicKey,
             newSmallerVaultInfo: newSmallerPublicKey,
             newLargerVaultInfo: newLargerPublicKey,
+            referralState: referralStatePublicKey,
+            referralAccount: referralAccountPublicKey,
+            userReferralAccount: userReferralAccountPublicKey,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,
         })

package/lib/instructions/psmEditAccount.js

@@ -0,0 +1,60 @@
+"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.psmEditAccountInstruction = exports.psmEditAccount = exports.psmStatus = 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 sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+var psmStatus;
+(function (psmStatus) {
+    psmStatus[psmStatus["PsmEnabled"] = 0] = "PsmEnabled";
+    psmStatus[psmStatus["PsmDisabled"] = 1] = "PsmDisabled";
+    psmStatus[psmStatus["MintOnly"] = 2] = "MintOnly";
+    psmStatus[psmStatus["RedeemOnly"] = 3] = "RedeemOnly";
+})(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 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 psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
+        const transaction = new web3_js_1.Transaction().add(yield psmEditAccountInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(mintFee), new anchor_1.BN(redeemFee), new anchor_1.BN(debtLimit), new anchor_1.BN(minSwap), overrideTime));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
+        return payer.publicKey;
+    });
+}
+exports.psmEditAccount = psmEditAccount;
+function psmEditAccountInstruction(program, payerPublicKey, psmAccount, collateralMint, mintFee, redeemFee, debtLimit, minSwap, overrideTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(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
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            psmAccount: psmAccount,
+            collateralMint: collateralMint,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
+    });
+}
+exports.psmEditAccountInstruction = psmEditAccountInstruction;

package/lib/instructions/psmMintUsh.js

@@ -18,7 +18,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
-function psmMintUsh(program, provider, payer, collateralMint, collateralAmount, overrideTime) {
+function psmMintUsh(program, provider, payer, collateralMint, collateralAmount, overrideTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
@@ -26,13 +26,22 @@ function psmMintUsh(program, provider, payer, collateralMint, collateralAmount,
         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 psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
-        const transaction = new web3_js_1.Transaction().add(yield psmMintUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(collateralAmount), overrideTime));
+        let referralAccountPublicKey;
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        if (!referrer) {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        }
+        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const transaction = new web3_js_1.Transaction().add(yield psmMintUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(collateralAmount), referralStatePublicKey, referralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return payer.publicKey;
     });
 }
 exports.psmMintUsh = psmMintUsh;
-function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMint, collateralAmount, overrideTime) {
+function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMint, collateralAmount, referralStatePublicKey, referralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -56,6 +65,8 @@ function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMi
             ownerCollateralAccount: ownerCollateralAccount,
             collateralMint: collateralMint,
             ushMint: ushMintPublickey,
+            referralState: referralStatePublicKey,
+            referralAccount: referralAccountPublicKey,
             systemProgram: web3_js_1.SystemProgram.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         })

package/lib/instructions/psmRedeemUsh.js

@@ -18,7 +18,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
-function psmRedeemUsh(program, provider, payer, collateralMint, ushAmount, overrideTime) {
+function psmRedeemUsh(program, provider, payer, collateralMint, ushAmount, overrideTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
@@ -26,13 +26,22 @@ function psmRedeemUsh(program, provider, payer, collateralMint, ushAmount, overr
         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 psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
-        const transaction = new web3_js_1.Transaction().add(yield psmRedeemUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(ushAmount), overrideTime));
+        let referralAccountPublicKey;
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        if (!referrer) {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+        }
+        else {
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        }
+        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const transaction = new web3_js_1.Transaction().add(yield psmRedeemUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(ushAmount), referralStatePublicKey, referralAccountPublicKey, overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return payer.publicKey;
     });
 }
 exports.psmRedeemUsh = psmRedeemUsh;
-function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateralMint, ushAmount, overrideTime) {
+function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateralMint, ushAmount, referralStatePublicKey, referralAccountPublicKey, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -56,6 +65,8 @@ function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateral
             ownerCollateralAccount: ownerCollateralAccount,
             collateralMint: collateralMint,
             ushMint: ushMintPublickey,
+            referralState: referralStatePublicKey,
+            referralAccount: referralAccountPublicKey,
             systemProgram: web3_js_1.SystemProgram.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         })

package/lib/instructions/referralClaimFees.js

@@ -0,0 +1,84 @@
+"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.referralClaimFeesInstruction = exports.referralClaimFees = void 0;
+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}  - Allows a referrer to claims their fees.
+ * This checks the user has enough HDG in their wallet or staked and
+ * then allows them to claim earned fees. 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
+*/
+function referralClaimFees(program, provider, payer, poolPosition) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // setup transaction  
+        const transaction = new web3_js_1.Transaction();
+        const signers = [payer];
+        // General variables
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        // Find referrer account
+        const referrer = yield payer.publicKey;
+        const referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+        // Derive the user referral account public key
+        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const hedgeMintPublicKey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        // Get HDG account of signer
+        const payerHdgAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMintPublicKey, payer.publicKey);
+        const ushMintPublicKey = yield (0, Constants_1.getUshMintPublicKey)();
+        // Get USH account of signer
+        const payerUshAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublicKey, payer.publicKey);
+        // Get community_associated_hedge_token_account
+        const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMintPublicKey, vaultSystemStatePublicKey, true);
+        const [feePoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublicKey);
+        const feePoolAssociatedUshTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublicKey, feePoolPublicKey, true);
+        transaction.add(yield referralClaimFeesInstruction(program, payer.publicKey, vaultSystemStatePublicKey, poolPosition, referralAccountPublicKey, referallStatePublicKey, hedgeMintPublicKey, payerHdgAssociatedTokenAccount.address, ushMintPublicKey, payerUshAssociatedTokenAccount.address, communityAssociatedHedgeTokenAccount.address, feePoolPublicKey, feePoolAssociatedUshTokenAccount.address));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
+        return referralAccountPublicKey;
+    });
+}
+exports.referralClaimFees = referralClaimFees;
+function referralClaimFeesInstruction(program, payerPublicKey, vaultSystemStatePublicKey, poolPositionPublicKey, referralAccountPublicKey, referralStatePublicKey, hedgeMintPublicKey, hdgAssociatedTokenAccountPublicKey, ushMintPublicKey, ushAssociatedTokenAccountPublicKey, communityAssociatedHedgeTokenAccountPublicKey, feePoolPublicKey, feePoolAssociatedUshTokenAccountPublicKey) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield program.methods
+            .referralClaimFees()
+            .accounts({
+            signer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            referralState: referralStatePublicKey,
+            referralAccount: referralAccountPublicKey,
+            poolPosition: poolPositionPublicKey,
+            hedgeMint: hedgeMintPublicKey,
+            signerHdgAta: hdgAssociatedTokenAccountPublicKey,
+            ushMint: ushMintPublicKey,
+            signerUshAta: ushAssociatedTokenAccountPublicKey,
+            communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccountPublicKey,
+            feePool: feePoolPublicKey,
+            feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccountPublicKey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
+    });
+}
+exports.referralClaimFeesInstruction = referralClaimFeesInstruction;