hedge-web3 0.2.31 → 0.3.0

package/lib/instructions/refreshOraclePrice.js

@@ -12,10 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cluster = exports.refreshOraclePriceInstruction = exports.refreshOraclePrice = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.Cluster = void 0;
+exports.refreshOraclePrice = refreshOraclePrice;
+exports.refreshOraclePriceInstruction = refreshOraclePriceInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function refreshOraclePrice(program, provider, payer, collateralType, network, overridePrice, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -23,12 +25,11 @@ function refreshOraclePrice(program, provider, payer, collateralType, network, o
         return yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
     });
 }
-exports.refreshOraclePrice = refreshOraclePrice;
 function refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const enc = new TextEncoder();
-        const [oracleInfoAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], program.programId);
-        const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], program.programId);
+        const [oracleInfoAccount] = yield web3_js_1.PublicKey.findProgramAddressSync([enc.encode(collateralType), enc.encode('Oracle')], program.programId);
+        const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddressSync([enc.encode(collateralType), enc.encode('State')], program.programId);
         const oracleInfo = yield program.account.oracleInfoForCollateralType.fetch(oracleInfoAccount);
         return yield program.methods
             .refreshOraclePrice(new anchor_1.BN(overridePrice !== null && overridePrice !== void 0 ? overridePrice : web3_js_1.LAMPORTS_PER_SOL * 150), // override usd/sol price
@@ -41,18 +42,17 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
             oraclePyth: oracleInfo.oraclePyth,
             oracleSwitchboard: oracleInfo.oracleSwitchboard,
             systemProgram: web3_js_1.SystemProgram.programId,
-            chainlinkProgram: Constants_1.CHAINLINK_PROGRAM_ID,
+            chainlinkProgram: HedgeConstants_1.CHAINLINK_PROGRAM_ID,
         })
             .instruction();
     });
 }
-exports.refreshOraclePriceInstruction = refreshOraclePriceInstruction;
 var Cluster;
 (function (Cluster) {
     Cluster["Testing"] = "Testing";
     Cluster["Devnet"] = "Devnet";
     Cluster["MainnetBeta"] = "MainnetBeta";
-})(Cluster = exports.Cluster || (exports.Cluster = {}));
+})(Cluster || (exports.Cluster = Cluster = {}));
 const pythAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),

package/lib/instructions/repayVault.js

@@ -12,22 +12,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.repayVaultInstruction = exports.repayVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.repayVault = repayVault;
+exports.repayVaultInstruction = repayVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         // Prep the user to get USH back out at some point
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
-        const vaultTypeAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultAccount.vaultType, vaultTypeAccount.collateralMint);
-        const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultPublicKey, vaultTypeAccount.collateralMint);
+        const vaultTypeAssociatedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultAccount.vaultType, vaultTypeAccount.collateralMint);
+        const vaultAssociatedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultPublicKey, vaultTypeAccount.collateralMint);
         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(0), new anchor_1.BN(Math.abs(repayAmount)), false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(repayAmount), overrideTime));
@@ -35,14 +36,13 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         return vaultPublicKey;
     });
 }
-exports.repayVault = repayVault;
 function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPublickey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         return yield program.methods
             .repayVault(repayAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
         )
@@ -67,4 +67,3 @@ function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPu
             .instruction();
     });
 }
-exports.repayVaultInstruction = repayVaultInstruction;

package/lib/instructions/setHalted.js

@@ -12,20 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setHaltedInstruction = exports.setHalted = void 0;
+exports.setHalted = setHalted;
+exports.setHaltedInstruction = setHaltedInstruction;
 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 setHalted(program, provider, payer, halted) {
     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);
         const transaction = new web3_js_1.Transaction().add(yield setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return vaultSystemStatePublicKey;
     });
 }
-exports.setHalted = setHalted;
 function setHaltedInstruction(program, vaultSystemStatePublicKey, payerPublicKey, halted) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
@@ -37,4 +37,3 @@ function setHaltedInstruction(program, vaultSystemStatePublicKey, payerPublicKey
             .instruction();
     });
 }
-exports.setHaltedInstruction = setHaltedInstruction;

package/lib/instructions/transferVault.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.transferVaultInstruction = exports.transferVault = void 0;
+exports.transferVault = transferVault;
+exports.transferVaultInstruction = transferVaultInstruction;
 const web3_js_1 = require("@solana/web3.js");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function transferVault(program, provider, payer, vaultPublicKey, vaultSystemStatePublicKey, vaultTypeAccount, newOwner) {
@@ -23,7 +24,6 @@ function transferVault(program, provider, payer, vaultPublicKey, vaultSystemStat
         return vaultPublicKey;
     });
 }
-exports.transferVault = transferVault;
 function transferVaultInstruction(vaultPublickey, vaultSystemStatePublicKey, vaultTypeAccount, historyPublicKey, vaultOwner, program, newOwner) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
@@ -38,4 +38,3 @@ function transferVaultInstruction(vaultPublickey, vaultSystemStatePublicKey, vau
             .instruction();
     });
 }
-exports.transferVaultInstruction = transferVaultInstruction;

package/lib/instructions/updateReferralAccount.js

@@ -12,23 +12,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateReferralAccountInstruction = exports.updateReferralAccount = void 0;
+exports.updateReferralAccount = updateReferralAccount;
+exports.updateReferralAccountInstruction = updateReferralAccountInstruction;
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function updateReferralAccount(program, provider, payer, referrer, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
-        const referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const referralAccountPublicKey = yield (0, HedgeConstants_1.getReferralAccountPublicKey)(program.programId, referrer);
         const transaction = new web3_js_1.Transaction().add(yield updateReferralAccountInstruction(program, vaultSystemStatePublicKey, referralAccountPublicKey, payer.publicKey, config));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return referralAccountPublicKey;
     });
 }
-exports.updateReferralAccount = updateReferralAccount;
 function updateReferralAccountInstruction(program, vaultSystemStatePublicKey, referralAccountPublicKey, payerPublicKey, referralAccountConfig) {
-    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
         const config = {
             setupCut: (_a = referralAccountConfig.setupCut) !== null && _a !== void 0 ? _a : null,
             stabilityCut: (_b = referralAccountConfig.stabilityCut) !== null && _b !== void 0 ? _b : null,
@@ -47,4 +47,3 @@ function updateReferralAccountInstruction(program, vaultSystemStatePublicKey, re
             .instruction();
     });
 }
-exports.updateReferralAccountInstruction = updateReferralAccountInstruction;

package/lib/instructions/updateReferralState.js

@@ -12,23 +12,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateReferralStateInstruction = exports.updateReferralState = void 0;
+exports.updateReferralState = updateReferralState;
+exports.updateReferralStateInstruction = updateReferralStateInstruction;
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function updateReferralState(program, provider, payer, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        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 transaction = new web3_js_1.Transaction().add(yield updateReferralStateInstruction(program, vaultSystemStatePublicKey, referralStatePublicKey, payer.publicKey, config));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return referralStatePublicKey;
     });
 }
-exports.updateReferralState = updateReferralState;
 function updateReferralStateInstruction(program, vaultSystemStatePublicKey, referralStatePublicKey, payerPublicKey, referralStateConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const config = {
             setupCut: (_a = referralStateConfig.setupCut) !== null && _a !== void 0 ? _a : null,
             stabilityCut: (_b = referralStateConfig.stabilityCut) !== null && _b !== void 0 ? _b : null,
@@ -54,4 +54,3 @@ function updateReferralStateInstruction(program, vaultSystemStatePublicKey, refe
             .instruction();
     });
 }
-exports.updateReferralStateInstruction = updateReferralStateInstruction;

package/lib/instructions/updateVaultType.js

@@ -12,22 +12,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateVaultTypeStatusInstruction = exports.updateVaultType = void 0;
+exports.updateVaultType = updateVaultType;
+exports.updateVaultTypeStatusInstruction = updateVaultTypeStatusInstruction;
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function updateVaultType(program, provider, payer, vaultTypeAccount, oracleInfoAccount, config) {
     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);
         const transaction = new web3_js_1.Transaction().add(yield updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, oracleInfoAccount, config));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return vaultSystemStatePublicKey;
     });
 }
-exports.updateVaultType = updateVaultType;
 function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, oracleInfoAccount, vaultTypeConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const config = {
             maxDebtExtended: (_a = vaultTypeConfig.maxDebtExtended) !== null && _a !== void 0 ? _a : null,
             minDebtPerVault: (_b = vaultTypeConfig.minDebtPerVault) !== null && _b !== void 0 ? _b : null,
@@ -53,4 +53,3 @@ function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, pa
             .instruction();
     });
 }
-exports.updateVaultTypeStatusInstruction = updateVaultTypeStatusInstruction;

package/lib/instructions/withdrawStakingPool.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.withdrawStakingPoolInstruction = exports.withdrawStakingPool = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.withdrawStakingPool = withdrawStakingPool;
+exports.withdrawStakingPoolInstruction = withdrawStakingPoolInstruction;
+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 withdrawStakingPool(program, provider, payer, poolPositionPublicKey, stakedTokenMintPublicKey, overrideStartTime) {
@@ -27,19 +28,18 @@ function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, st
         return poolPosition.publicKey;
     });
 }
-exports.withdrawStakingPool = withdrawStakingPool;
 function withdrawStakingPoolInstruction(program, payerPublicKey, poolPositionPublicKey, stakedTokenMintPublicKey, 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 hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
-        const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
-        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, stakedTokenMintPublicKey);
-        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, ushMintPublickey);
-        const payerAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, stakedTokenMintPublicKey);
-        const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
-        const payerAssociatedUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId);
+        const [poolPublickey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
+        const poolAssociatedStakedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, stakedTokenMintPublicKey);
+        const poolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, ushMintPublickey);
+        const payerAssociatedStakedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, stakedTokenMintPublicKey);
+        const payerAssociatedHedgeAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
+        const payerAssociatedUshAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
+        const communityHedgeTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
         return yield program.methods
             .withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )
@@ -63,4 +63,3 @@ function withdrawStakingPoolInstruction(program, payerPublicKey, poolPositionPub
             .instruction();
     });
 }
-exports.withdrawStakingPoolInstruction = withdrawStakingPoolInstruction;

package/lib/instructions/withdrawVault.js

@@ -12,35 +12,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawVaultInstruction = exports.withdrawVault = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.withdrawVault = withdrawVault;
+exports.withdrawVaultInstruction = withdrawVaultInstruction;
+const anchor_1 = require("@coral-xyz/anchor");
 const serum_1 = require("@project-serum/serum");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Constants_1 = require("../Constants");
+const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
         // Prep the user to get USH back out at some point
         yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const history = web3_js_1.Keypair.generate();
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
         const vaultAssociatedCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, serum_1.TokenInstructions.WRAPPED_SOL_MINT, vaultPublicKey, true);
         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 destinationTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
-        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
+        const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(Math.abs(withdrawAmount)), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
         const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(withdrawAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
-exports.withdrawVault = withdrawVault;
 function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMint, historyPublicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield program.methods
@@ -67,4 +67,3 @@ function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPubli
             .instruction();
     });
 }
-exports.withdrawVaultInstruction = withdrawVaultInstruction;

package/lib/state/VaultAccount.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];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/lib/state/VaultHistoryEvent.js

@@ -28,7 +28,7 @@ var VaultStatus;
     VaultStatus[VaultStatus["Liquidated"] = 2] = "Liquidated";
     VaultStatus[VaultStatus["Distributed"] = 3] = "Distributed";
     VaultStatus[VaultStatus["Redeemed"] = 4] = "Redeemed";
-})(VaultStatus = exports.VaultStatus || (exports.VaultStatus = {}));
+})(VaultStatus || (exports.VaultStatus = VaultStatus = {}));
 var VaultHistoryAction;
 (function (VaultHistoryAction) {
     VaultHistoryAction[VaultHistoryAction["Create"] = 0] = "Create";
@@ -42,4 +42,4 @@ var VaultHistoryAction;
     VaultHistoryAction[VaultHistoryAction["Withdraw"] = 8] = "Withdraw";
     VaultHistoryAction[VaultHistoryAction["Loan"] = 9] = "Loan";
     VaultHistoryAction[VaultHistoryAction["RepayCredit"] = 10] = "RepayCredit";
-})(VaultHistoryAction = exports.VaultHistoryAction || (exports.VaultHistoryAction = {}));
+})(VaultHistoryAction || (exports.VaultHistoryAction = VaultHistoryAction = {}));

package/lib/utils/Errors.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAnchorErrors = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.parseAnchorErrors = parseAnchorErrors;
+const anchor_1 = require("@coral-xyz/anchor");
 const vault_1 = require("../idl/vault");
 function parseAnchorErrors(error) {
     const idlErrors = (0, anchor_1.parseIdlErrors)(vault_1.IDL);
@@ -12,4 +12,3 @@ function parseAnchorErrors(error) {
     }
     throw error;
 }
-exports.parseAnchorErrors = parseAnchorErrors;

package/lib/utils/getLinkedListAccounts.js

@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLinkedListAccounts = void 0;
-const anchor_1 = require("@project-serum/anchor");
+exports.getLinkedListAccounts = getLinkedListAccounts;
+const anchor_1 = require("@coral-xyz/anchor");
 const underscore_1 = __importDefault(require("underscore"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const VaultAccount_1 = require("../state/VaultAccount");
@@ -166,7 +166,6 @@ function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKe
         return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults];
     });
 }
-exports.getLinkedListAccounts = getLinkedListAccounts;
 // Sort function we can use to sort the vaults
 // Sorted by collateral ratio. If two are the same, newer vault first
 function sortVaults(a, b) {

package/lib/utils/sendAndConfirmWithDebug.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = sendAndConfirmWithDebug;
 function sendAndConfirmWithDebug(connection, transaction, signers) {
     return __awaiter(this, void 0, void 0, function* () {
         return connection
@@ -32,4 +33,3 @@ function sendAndConfirmWithDebug(connection, transaction, signers) {
         });
     });
 }
-exports.default = sendAndConfirmWithDebug;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.31",
+  "version": "0.3.0",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -14,26 +14,27 @@
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "dependencies": {
-    "@project-serum/anchor": "0.24.2",
-    "@project-serum/serum": "^0.13.61",
+    "@coral-xyz/anchor": "^0.29.0",
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",
-    "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.63.1",
+    "@solana/spl-token": "^0.3.9",
+    "@solana/spl-token-metadata": "^0.1.6",
+    "@solana/web3.js": "^1.90.0",
     "@types/bn.js": "^5.1.0",
     "@types/underscore": "^1.11.4",
     "@types/uuid": "^8.3.4",
     "bn.js": "^5.2.0",
     "bs58": "^5.0.0",
     "decimal.js": "^10.3.1",
+    "i": "^0.3.7",
+    "npm": "^10.9.2",
     "rollup": "^2.62.0",
     "ts-standard": "^11.0.0",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.5.5",
+    "typedoc": "^0.27.6",
     "underscore": "^1.13.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/node-fetch": "^2.6.2"
+    "typescript": "^5.7.3"
   }
 }