hedge-web3 0.2.33 → 0.3.2

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,7 +14,7 @@ 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("./Constants"), exports);
+__exportStar(require("./HedgeConstants"), exports);
 __exportStar(require("./HedgeDecimal"), exports);
 __exportStar(require("./idl/vault"), exports);
 __exportStar(require("./instructions/claimLiquidationPoolPosition"), exports);
@@ -20,8 +24,6 @@ __exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/createReferralAccount"), exports);
 __exportStar(require("./instructions/createStakingPool"), exports);
 __exportStar(require("./instructions/createUserReferralAccount"), exports);
-__exportStar(require("./instructions/compoundCreateReferralAccount"), exports);
-__exportStar(require("./instructions/compoundReferralClaimFees"), exports);
 __exportStar(require("./instructions/createVault"), exports);
 __exportStar(require("./instructions/depositLiquidationPool"), exports);
 __exportStar(require("./instructions/depositStakingPool"), exports);
@@ -38,15 +40,6 @@ __exportStar(require("./instructions/refreshOraclePrice"), exports);
 __exportStar(require("./instructions/repayVault"), exports);
 __exportStar(require("./instructions/setHalted"), exports);
 __exportStar(require("./instructions/transferVault"), exports);
-__exportStar(require("./instructions/createCompoundStakingPool"), exports);
-__exportStar(require("./instructions/createCompoundStakingPoolPosition"), exports);
-__exportStar(require("./instructions/depositCompoundStakingPoolPosition"), exports);
-__exportStar(require("./instructions/withdrawCompoundStakingPoolPosition"), exports);
-__exportStar(require("./instructions/setDelegateWallet"), exports);
-__exportStar(require("./instructions/setCompoundPoolActive"), exports);
-__exportStar(require("./instructions/adminWithdrawCol"), exports);
-__exportStar(require("./instructions/adminWithdrawUsh"), exports);
-__exportStar(require("./instructions/depositRewardsToCompoundPool"), exports);
 __exportStar(require("./instructions/updateReferralAccount"), exports);
 __exportStar(require("./instructions/updateReferralState"), exports);
 __exportStar(require("./instructions/updateVaultType"), exports);

package/lib/instructions/claimLiquidationPoolPosition.js

@@ -12,15 +12,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimLiquidationPoolPositionInstruction = exports.claimLiquidationPoolPosition = void 0;
+exports.claimLiquidationPoolPosition = claimLiquidationPoolPosition;
+exports.claimLiquidationPoolPositionInstruction = claimLiquidationPoolPositionInstruction;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function claimLiquidationPoolPosition(program, provider, poolPosition, payer, collateralType, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
+        const vaultTypeAccountPublicKey = yield (0, HedgeConstants_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);
@@ -29,12 +30,11 @@ function claimLiquidationPoolPosition(program, provider, poolPosition, payer, co
         return payerAssociatedTokenAccount.address;
     });
 }
-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)(program.programId);
-        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
-        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolStatePublicKey, collateralMint);
+        const vaultSystemState = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const poolStatePublicKey = yield (0, HedgeConstants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const poolAssociatedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, poolStatePublicKey, collateralMint);
         return yield program.methods
             .claimLiquidationPoolPosition()
             .accounts({
@@ -54,4 +54,3 @@ function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, coll
             .instruction();
     });
 }
-exports.claimLiquidationPoolPositionInstruction = claimLiquidationPoolPositionInstruction;

package/lib/instructions/claimStakingPoolPosition.js

@@ -12,19 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimStakingPoolPositionInstruction = exports.claimStakingPoolPosition = void 0;
+exports.claimStakingPoolPosition = claimStakingPoolPosition;
+exports.claimStakingPoolPositionInstruction = claimStakingPoolPositionInstruction;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function claimStakingPoolPosition(program, provider, poolPosition, payer, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
+        const vaultTypeAccount = yield (0, HedgeConstants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccount);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
-        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMint);
+        const stakedTokenMint = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [feePool] = yield (0, HedgeConstants_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));
@@ -32,10 +33,9 @@ function claimStakingPoolPosition(program, provider, poolPosition, payer, collat
         return payerAssociatedTokenAccount.address;
     });
 }
-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)(program.programId);
+        const vaultSystemState = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .claimStakingPoolPosition()
             .accounts({
@@ -56,4 +56,3 @@ function claimStakingPoolPositionInstruction(program, feePool, feePoolAssociated
             .instruction();
     });
 }
-exports.claimStakingPoolPositionInstruction = claimStakingPoolPositionInstruction;

package/lib/instructions/closeClaimedLiquidationPoolPosition.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeClaimedLiquidationPoolPositionInstruction = exports.closeClaimedLiquidationPoolPosition = void 0;
+exports.closeClaimedLiquidationPoolPosition = closeClaimedLiquidationPoolPosition;
+exports.closeClaimedLiquidationPoolPositionInstruction = closeClaimedLiquidationPoolPositionInstruction;
 const web3_js_1 = require("@solana/web3.js");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
@@ -23,7 +24,6 @@ function closeClaimedLiquidationPoolPosition(program, provider, poolPosition, pa
         return poolPosition;
     });
 }
-exports.closeClaimedLiquidationPoolPosition = closeClaimedLiquidationPoolPosition;
 function closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer) {
     return __awaiter(this, void 0, void 0, function* () {
         return program.methods
@@ -35,4 +35,3 @@ function closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, p
             .instruction();
     });
 }
-exports.closeClaimedLiquidationPoolPositionInstruction = closeClaimedLiquidationPoolPositionInstruction;

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -12,46 +12,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeLiquidationPoolPositionInstruction = exports.closeLiquidationPoolPosition = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.closeLiquidationPoolPosition = closeLiquidationPoolPosition;
+exports.closeLiquidationPoolPositionInstruction = closeLiquidationPoolPositionInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function closeLiquidationPoolPosition(program, provider, poolPosition, payer, overrideStartTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const referralStatePublicKey = yield (0, HedgeConstants_1.getReferralStatePublicKey)(program.programId);
         const liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
-        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const hedgeMint = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
         const payerAssociatedHedgeAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, payer.publicKey);
         const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true);
         let referralAccountPublicKey = null;
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, HedgeConstants_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, userReferralAccountPublicKey, referralAccountPublicKey, referralStatePublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        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);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMint = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMint = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const poolUshAccount = yield (0, HedgeConstants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const poolState = yield (0, HedgeConstants_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
         )
@@ -78,4 +78,3 @@ function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition,
             .instruction();
     });
 }
-exports.closeLiquidationPoolPositionInstruction = closeLiquidationPoolPositionInstruction;

package/lib/instructions/createReferralAccount.js

@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReferralAccountInstruction = exports.createReferralAccount = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.createReferralAccount = createReferralAccount;
+exports.createReferralAccountInstruction = createReferralAccountInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 /** @type {Function}  - Creates a new referral account.
@@ -38,26 +39,25 @@ function createReferralAccount(program, provider, payer, poolPosition, overrideT
         const signers = [payer];
         const referrer = payer.publicKey;
         // Setup public keys
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         // Find referral account
-        let referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        let referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         // Get the referral state PDA
-        const referallStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
+        const referallStatePublicKey = yield (0, HedgeConstants_1.getReferralStatePublicKey)(program.programId);
         // Get HDG mint public key
-        const hedgeMintPublicKey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const hedgeMintPublicKey = yield (0, HedgeConstants_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);
+        const userReferralAccountPublicKey = yield (0, HedgeConstants_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);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_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
         )
@@ -77,4 +77,3 @@ function createReferralAccountInstruction(program, payerPublicKey, poolPositionP
             .instruction();
     });
 }
-exports.createReferralAccountInstruction = createReferralAccountInstruction;

package/lib/instructions/createStakingPool.js

@@ -12,29 +12,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStakingPoolInstruction = exports.createStakingPool = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.createStakingPool = createStakingPool;
+exports.createStakingPoolInstruction = createStakingPoolInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function 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)(program.programId, mintPublicKey);
+        const [poolPublickey] = yield (0, HedgeConstants_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)(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);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const [poolPublickey, poolBump] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, mintPublicKey);
+        const poolAssociatedStakedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, mintPublicKey);
+        const poolAssociatedUshTokenAccount = yield (0, HedgeConstants_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({
@@ -53,4 +53,3 @@ function createStakingPoolInstruction(program, payerPublicKey, mintPublicKey, he
             .instruction();
     });
 }
-exports.createStakingPoolInstruction = createStakingPoolInstruction;

package/lib/instructions/createUserReferralAccount.js

@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUserReferralAccountInstruction = exports.createUserReferralAccount = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.createUserReferralAccount = createUserReferralAccount;
+exports.createUserReferralAccountInstruction = createUserReferralAccountInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function createUserReferralAccount(program, provider, payer, referrer, overrideTime) {
@@ -26,24 +27,23 @@ function createUserReferralAccount(program, provider, payer, referrer, overrideT
         const signers = [payer];
         // Find referrer account
         let referralAccountPublicKey = null;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, HedgeConstants_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);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_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
         )
@@ -58,4 +58,3 @@ function createUserReferralAccountInstruction(program, payerPublicKey, referralA
             .instruction();
     });
 }
-exports.createUserReferralAccountInstruction = createUserReferralAccountInstruction;

package/lib/instructions/createVault.js

@@ -12,33 +12,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createVaultInstruction = exports.buildCreateVaultTransaction = exports.createVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
-const serum_1 = require("@project-serum/serum");
+exports.createVault = createVault;
+exports.buildCreateVaultTransaction = buildCreateVaultTransaction;
+exports.createVaultInstruction = createVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const uuid_1 = require("uuid");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+const spl_token_2 = require("@solana/spl-token");
+const spl_token_3 = require("@solana/spl-token");
 function createVault(program, provider, payer, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const salt = (0, uuid_1.v4)().substring(0, 8);
-        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(program.programId, salt);
+        const newVaultPublicKey = yield (0, HedgeConstants_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)(program.programId, collateralType);
+        const vaultTypeAccountPublicKey = yield (0, HedgeConstants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
-        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 payerTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payer.publicKey, vaultTypeAccountInfo.collateralMint);
+        const vaultAssociatedTokenAccount = yield (0, HedgeConstants_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)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
-        const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString();
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
+        const feePoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         if (isWrappedSol) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
@@ -46,51 +49,43 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
                 space: 165,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey,
-            }));
+            }), (0, spl_token_2.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payer.publicKey));
             signers.push(wrappedSolAccount);
         }
         transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payer.publicKey,
-                owner: payer.publicKey,
-            }));
+            transaction.add((0, spl_token_3.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payer.publicKey, payer.publicKey));
         }
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
+        const result = yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
         return newVaultPublicKey;
     });
 }
-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)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const salt = (0, uuid_1.v4)().substring(0, 8);
-        const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(program.programId, salt);
+        const newVaultPublicKey = yield (0, HedgeConstants_1.findVaultAddress)(program.programId, salt);
         const history = web3_js_1.Keypair.generate();
         const { blockhash, lastValidBlockHeight } = yield program.provider.connection.getLatestBlockhash();
         const transaction = new web3_js_1.Transaction({
             feePayer: payerPublicKey,
-            recentBlockhash: blockhash,
+            blockhash: blockhash,
+            lastValidBlockHeight: lastValidBlockHeight,
         });
         const signers = [history];
         const wrappedSolAccount = web3_js_1.Keypair.generate();
         console.log('Lookup getVaultTypeAccountPublicKey', collateralType);
         // Lookup the vault type info
-        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
+        const vaultTypeAccountPublicKey = yield (0, HedgeConstants_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)(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);
+        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString();
+        const payerTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, vaultTypeAccountInfo.collateralMint);
+        const vaultAssociatedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
+        const feePoolAssociatedUshTokenAccount = yield (0, HedgeConstants_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) {
@@ -100,21 +95,13 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
                 space: 165,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payerPublicKey,
-            }));
+            }), (0, spl_token_2.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payerPublicKey));
             signers.push(wrappedSolAccount);
         }
         console.log('hedgeStakingPoolPublicKey', hedgeStakingPoolPublicKey.toString());
         transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payerPublicKey,
-                owner: payerPublicKey,
-            }));
+            transaction.add((0, spl_token_3.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payerPublicKey, payerPublicKey));
             transaction.partialSign(wrappedSolAccount);
         }
         transaction.partialSign(history);
@@ -122,25 +109,24 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
         return [transaction, signers, newVaultPublicKey];
     });
 }
-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)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_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
+            .createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,
             vaultTypeAccount: vaultTypeAccount,
             vault: vaultPublicKey,
             vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-            feePool: feePool,
-            feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
+            // feePool: feePool,
+            // feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
             history: historyPublicKey,
             payer: payerPublicKey,
             payerTokenAccount: payerTokenAccountPublicKey,
             collateralMint: collateralMint,
-            ushMint: ushMintPublickey,
+            // ushMint: ushMintPublickey,
             systemProgram: web3_js_1.SystemProgram.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -149,4 +135,3 @@ function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccount
             .instruction();
     });
 }
-exports.createVaultInstruction = createVaultInstruction;

package/lib/instructions/depositLiquidationPool.js

@@ -12,40 +12,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depositLiquidationPoolInstruction = exports.depositLiquidationPool = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.depositLiquidationPool = depositLiquidationPool;
+exports.depositLiquidationPoolInstruction = depositLiquidationPoolInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function depositLiquidationPool(program, provider, payer, depositAmount, overrideStartTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         let referralAccountPublicKey = null;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+            referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, HedgeConstants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, vaultSystemStatePublicKey, payerUshAccount.address, poolPosition.publicKey, new anchor_1.BN(depositAmount), userReferralAccountPublicKey, referralAccountPublicKey, overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
-exports.depositLiquidationPool = depositLiquidationPool;
 function depositLiquidationPoolInstruction(program, payerPublicKey, vaultSystemStatePublicKey, payerUshAccount, poolPositionPublicKey, depositAmount, userReferralAccountPublicKey, referralAccountPublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const liquidationPoolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const liquidationPoolStatePublicKey = yield (0, HedgeConstants_1.getLiquidationPoolStatePublicKey)(program.programId);
         const liquidationPoolState = yield program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey);
-        const poolUSHAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
-        const ushMint = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const poolUSHAccount = yield (0, HedgeConstants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const ushMint = yield (0, HedgeConstants_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
         )
@@ -66,4 +66,3 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, vaultSystemS
             .instruction();
     });
 }
-exports.depositLiquidationPoolInstruction = depositLiquidationPoolInstruction;