hedge-web3 0.2.21 → 0.2.25

package/lib/instructions/updateReferralAccount.js

@@ -0,0 +1,50 @@
+"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.updateReferralAccountInstruction = exports.updateReferralAccount = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+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 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* () {
+        const config = {
+            setupCut: (_a = referralAccountConfig.setupCut) !== null && _a !== void 0 ? _a : null,
+            stabilityCut: (_b = referralAccountConfig.stabilityCut) !== null && _b !== void 0 ? _b : null,
+            referredUserDiscount: (_c = referralAccountConfig.referredUserDiscount) !== null && _c !== void 0 ? _c : null,
+            psmCut: (_d = referralAccountConfig.psmCut) !== null && _d !== void 0 ? _d : null,
+            hdgThreshold: (_e = referralAccountConfig.hdgThreshold) !== null && _e !== void 0 ? _e : null,
+        };
+        return yield program.methods
+            .updateReferralAccount(config)
+            .accounts({
+            signer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            referralAccount: referralAccountPublicKey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
+    });
+}
+exports.updateReferralAccountInstruction = updateReferralAccountInstruction;

package/lib/instructions/updateReferralState.js

@@ -0,0 +1,57 @@
+"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.updateReferralStateInstruction = exports.updateReferralState = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+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 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* () {
+        const config = {
+            setupCut: (_a = referralStateConfig.setupCut) !== null && _a !== void 0 ? _a : null,
+            stabilityCut: (_b = referralStateConfig.stabilityCut) !== null && _b !== void 0 ? _b : null,
+            referredUserDiscount: (_c = referralStateConfig.referredUserDiscount) !== null && _c !== void 0 ? _c : null,
+            psmCut: (_d = referralStateConfig.psmCut) !== null && _d !== void 0 ? _d : null,
+            maxSetupCut: (_e = referralStateConfig.maxSetupCut) !== null && _e !== void 0 ? _e : null,
+            maxReferredDiscount: (_f = referralStateConfig.maxReferredDiscount) !== null && _f !== void 0 ? _f : null,
+            maxStabilityCut: (_g = referralStateConfig.maxStabilityCut) !== null && _g !== void 0 ? _g : null,
+            maxPsmCut: (_h = referralStateConfig.maxPsmCut) !== null && _h !== void 0 ? _h : null,
+            hdgThreshold: (_j = referralStateConfig.hdgThreshold) !== null && _j !== void 0 ? _j : null,
+            hdgPsmThreshold: (_k = referralStateConfig.hdgPsmThreshold) !== null && _k !== void 0 ? _k : null,
+            referralPromoThreshold: (_l = referralStateConfig.referralThreshold) !== null && _l !== void 0 ? _l : null,
+            referralEnabled: (_m = referralStateConfig.referralEnabled) !== null && _m !== void 0 ? _m : null,
+        };
+        return yield program.methods
+            .updateReferralState(config)
+            .accounts({
+            signer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            referralState: referralStatePublicKey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
+    });
+}
+exports.updateReferralStateInstruction = updateReferralStateInstruction;

package/lib/instructions/updateVaultType.js

@@ -18,7 +18,7 @@ const Constants_1 = require("../Constants");
 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)();
+        const vaultSystemStatePublicKey = yield (0, Constants_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;

package/lib/instructions/withdrawStakingPool.js

@@ -16,8 +16,8 @@ exports.withdrawStakingPoolInstruction = exports.withdrawStakingPool = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, stakedTokenMintPublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -30,16 +30,16 @@ function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, st
 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)();
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(stakedTokenMintPublicKey);
-        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, stakedTokenMintPublicKey);
-        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, ushMintPublickey);
-        const payerAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, stakedTokenMintPublicKey);
-        const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
-        const payerAssociatedUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, ushMintPublickey);
-        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
+        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);
         return yield program.methods
             .withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )

package/lib/instructions/withdrawVault.js

@@ -14,26 +14,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawVaultInstruction = exports.withdrawVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
-const spl_token_1 = require("@solana/spl-token");
 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 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)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         // Prep the user to get USH back out at some point
         yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const history = web3_js_1.Keypair.generate();
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_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)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, yield (0, Constants_1.getHedgeMintPublicKey)(program.programId));
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         const [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]);

package/lib/state/VaultAccount.js

@@ -163,7 +163,9 @@ class VaultAccount {
             .mul(new decimal_js_1.default(this.denormalizedDebt.toString()))
             .floor()
             .toString());
-        const extraCollateralDeposited = new decimal_js_1.default(this.denormalizedDebt.toString()).mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()).floor();
+        const extraCollateralDeposited = new decimal_js_1.default(this.denormalizedDebt.toString())
+            .mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber())
+            .floor();
         this.deposited = this.deposited.add(new bn_js_1.default(extraCollateralDeposited.toString()));
         this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator;
         this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct;

package/lib/utils/getLinkedListAccounts.js

@@ -15,9 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const underscore_1 = __importDefault(require("underscore"));
-const Constants_1 = require("../Constants");
-const VaultAccount_1 = require("../state/VaultAccount");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const VaultAccount_1 = require("../state/VaultAccount");
 const bs58_1 = __importDefault(require("bs58"));
 const VaultType_1 = __importDefault(require("../state/VaultType"));
 /**
@@ -200,7 +199,7 @@ function getMiniVaults(program, vaultTypePublicKey) {
                 },
             },
         ];
-        const allAccounts = yield program.provider.connection.getProgramAccounts(Constants_1.HEDGE_PROGRAM_PUBLICKEY, {
+        const allAccounts = yield program.provider.connection.getProgramAccounts(program.programId, {
             filters: filters,
             // Slice the data only to grab the 3 u64's of size 8 bytes each
             dataSlice: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.21",
+  "version": "0.2.25",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/Constants.ts

@@ -1,152 +1,153 @@
-import {
-  ASSOCIATED_TOKEN_PROGRAM_ID,
-  TOKEN_PROGRAM_ID,
-} from '@solana/spl-token'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HedgeEohwU6RqokrvPU4Hb6XKPub8NuKbnPmY7FoMMtN'
-export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
-
-export const CHAINLINK_SOL_USD_ID =
-  'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
+export const CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
 export const CHAINLINK_SOL_USD_PUBLICKEY = new PublicKey(CHAINLINK_SOL_USD_ID)
-export const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
+export const CHAINLINK_PROGRAM_ID = 'HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny'
 
 const enc = new TextEncoder()
 
 /**
  * @returns The Liquidation pool public key
  */
-export async function getLiquidationPoolStatePublicKey(): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('LiquidationPoolStateV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getLiquidationPoolStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
- * 
+ *
  * @returns The liquidation pool ush account public key
  */
-export async function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('LiquidationPoolUSHAccountV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getLiquidationPoolUshAccountPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
- * 
+ *
  * @returns The USH mint public key
  */
-export async function getUshMintPublicKey(): Promise<PublicKey> {
-  const [findMintPublicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('UshMintV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getUshMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [findMintPublicKey] = await PublicKey.findProgramAddress([enc.encode('UshMintV1')], hedgeProgramId)
   return findMintPublicKey
 }
 /**
- * 
+ *
  * @returns The Vault System State public key
  */
-export async function getVaultSystemStatePublicKey(): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('VaultSystemStateV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getVaultSystemStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], hedgeProgramId)
+  return publicKey
+}
+
+/**
+ *
+ * @returns The Referral State public key
+ */
+export async function getReferralStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('ReferralStateV1')], hedgeProgramId)
+  return publicKey
+}
+
+/**
+ *
+ * @returns The Referral State public key based off the owner's public key
+ */
+export async function getReferralAccountPublicKey(hedgeProgramId: PublicKey, ownerPublicKey: PublicKey): Promise<PublicKey> {
+  const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('refer_acct'), strToEncode], hedgeProgramId)
   return publicKey
 }
 
 /**
- * 
+ *
+ * @returns The user referral account public key based off the user's public key
+ */
+export async function getUserReferralAccountPublicKey(
+  hedgeProgramId: PublicKey,
+  ownerPublicKey: PublicKey
+): Promise<PublicKey> {
+  const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('user_ref'), strToEncode], hedgeProgramId)
+  return publicKey
+}
+
+/**
+ *
  * @returns The HDG mint public key
  */
-export async function getHedgeMintPublicKey(): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress(
-    [enc.encode('HEDGEMintV1')],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function getHedgeMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], hedgeProgramId)
   return publicKey
 }
 /**
  * Get the public key for any staking pool
- * 
+ *
  * @param mintPublicKey Staked collateral mint public key
  * @returns the public key for that staking pool
  */
 export async function getPoolPublicKeyForMint(
+  hedgeProgramId: PublicKey,
   mintPublicKey: PublicKey
 ): Promise<[PublicKey, number, string]> {
   const strToEncode = mintPublicKey.toString().substring(0, 12)
-  const [publicKey, bump] = await PublicKey.findProgramAddress(
-    [enc.encode(strToEncode)],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode(strToEncode)], hedgeProgramId)
   return [publicKey, bump, strToEncode]
 }
 
 /**
- * 
+ *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type account
  */
-export async function getVaultTypeAccountPublicKey(
-  collateralType: string
-): Promise<PublicKey> {
+export async function getVaultTypeAccountPublicKey(hedgeProgramId: PublicKey, collateralType: string): Promise<PublicKey> {
   const [vaultTypeAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('State')],
-    HEDGE_PROGRAM_PUBLICKEY
+    hedgeProgramId
   )
   return vaultTypeAccount
 }
 
 /**
- * 
+ *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type oracle info
  */
 export async function getVaultTypeOracleAccountPublicKey(
+  hedgeProgramId: PublicKey,
   collateralType: string
 ): Promise<PublicKey> {
   const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('Oracle')],
-    HEDGE_PROGRAM_PUBLICKEY
+    hedgeProgramId
   )
   return vaultTypeOracleAccount
 }
 
 /**
  * Vaults are stored in PDA accounts. Use this to get the address from a salt
- * 
+ *
  * @param vaultSalt String salt for the vault (must be 8 chars)
  * @returns The public key for that Vault Type oracle info
  */
-export async function findVaultAddress(vaultSalt: string): Promise<PublicKey> {
-  const [vaultAddress] = await PublicKey.findProgramAddress(
-    [enc.encode('Vault'), enc.encode(vaultSalt)],
-    HEDGE_PROGRAM_PUBLICKEY
-  )
+export async function findVaultAddress(hedgeProgramId: PublicKey, vaultSalt: string): Promise<PublicKey> {
+  const [vaultAddress] = await PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], hedgeProgramId)
   return vaultAddress
 }
 
 /**
- * 
+ *
  * @param walletAddress Owner public key
  * @param tokenMintAddress Token mint
  * @returns The associated token account public key
  */
 export async function findAssociatedTokenAddress(
+  hedgeProgramId: PublicKey,
   walletAddress: PublicKey,
   tokenMintAddress: PublicKey
 ): Promise<PublicKey> {
   return (
     await PublicKey.findProgramAddress(
-      [
-        walletAddress.toBuffer(),
-        TOKEN_PROGRAM_ID.toBuffer(),
-        tokenMintAddress.toBuffer(),
-      ],
+      [walletAddress.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMintAddress.toBuffer()],
       ASSOCIATED_TOKEN_PROGRAM_ID
     )
   )[0]

package/src/idl/pyth.ts

@@ -5,19 +5,9 @@ export type Pyth = {
     {
       "name": "initialize",
       "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
         {
           "name": "price",
           "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
           "isSigner": false
         }
       ],
@@ -53,27 +43,57 @@ export type Pyth = {
       ]
     }
   ],
-  "accounts": [
+  "types": [
     {
-      "name": "priceWrapper",
+      "name": "PriceStatus",
       "type": {
-        "kind": "struct",
-        "fields": [
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Unknown"
+          },
+          {
+            "name": "Trading"
+          },
           {
-            "name": "price",
-            "type": {
-              "defined": "Price"
-            }
+            "name": "Halted"
+          },
+          {
+            "name": "Auction"
           }
         ]
       }
-    }
-  ],
-  "errors": [
+    },
+    {
+      "name": "CorpAction",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "NoCorpAct"
+          }
+        ]
+      }
+    },
     {
-      "code": 6000,
-      "name": "InvalidTradingStatus",
-      "msg": "invalid trading status"
+      "name": "PriceType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Unknown"
+          },
+          {
+            "name": "Price"
+          },
+          {
+            "name": "TWAP"
+          },
+          {
+            "name": "Volatility"
+          }
+        ]
+      }
     }
   ]
 };
@@ -85,19 +105,9 @@ export const IDL: Pyth = {
     {
       "name": "initialize",
       "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
         {
           "name": "price",
           "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
           "isSigner": false
         }
       ],
@@ -133,27 +143,57 @@ export const IDL: Pyth = {
       ]
     }
   ],
-  "accounts": [
+  "types": [
     {
-      "name": "priceWrapper",
+      "name": "PriceStatus",
       "type": {
-        "kind": "struct",
-        "fields": [
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Unknown"
+          },
+          {
+            "name": "Trading"
+          },
           {
-            "name": "price",
-            "type": {
-              "defined": "Price"
-            }
+            "name": "Halted"
+          },
+          {
+            "name": "Auction"
           }
         ]
       }
-    }
-  ],
-  "errors": [
+    },
+    {
+      "name": "CorpAction",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "NoCorpAct"
+          }
+        ]
+      }
+    },
     {
-      "code": 6000,
-      "name": "InvalidTradingStatus",
-      "msg": "invalid trading status"
+      "name": "PriceType",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Unknown"
+          },
+          {
+            "name": "Price"
+          },
+          {
+            "name": "TWAP"
+          },
+          {
+            "name": "Volatility"
+          }
+        ]
+      }
     }
   ]
 };