hedge-web3 0.2.24 → 0.2.25

package/declarations/Constants.d.ts

@@ -1,78 +1,76 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const HEDGE_PROGRAM_ID = "HedgeEohwU6RqokrvPU4Hb6XKPub8NuKbnPmY7FoMMtN";
-export declare const HEDGE_PROGRAM_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_SOL_USD_ID = "FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf";
 export declare const CHAINLINK_SOL_USD_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
 /**
  * @returns The Liquidation pool public key
  */
-export declare function getLiquidationPoolStatePublicKey(): Promise<PublicKey>;
+export declare function getLiquidationPoolStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The liquidation pool ush account public key
  */
-export declare function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey>;
+export declare function getLiquidationPoolUshAccountPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The USH mint public key
  */
-export declare function getUshMintPublicKey(): Promise<PublicKey>;
+export declare function getUshMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The Vault System State public key
  */
-export declare function getVaultSystemStatePublicKey(): Promise<PublicKey>;
+export declare function getVaultSystemStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The Referral State public key
  */
-export declare function getReferralStatePublicKey(): Promise<PublicKey>;
+export declare function getReferralStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The Referral State public key based off the owner's public key
  */
-export declare function getReferralAccountPublicKey(ownerPublicKey: PublicKey): Promise<PublicKey>;
+export declare function getReferralAccountPublicKey(hedgeProgramId: PublicKey, ownerPublicKey: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The user referral account public key based off the user's public key
  */
-export declare function getUserReferralAccountPublicKey(ownerPublicKey: PublicKey): Promise<PublicKey>;
+export declare function getUserReferralAccountPublicKey(hedgeProgramId: PublicKey, ownerPublicKey: PublicKey): Promise<PublicKey>;
 /**
  *
  * @returns The HDG mint public key
  */
-export declare function getHedgeMintPublicKey(): Promise<PublicKey>;
+export declare function getHedgeMintPublicKey(hedgeProgramId: PublicKey): Promise<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 declare function getPoolPublicKeyForMint(mintPublicKey: PublicKey): Promise<[PublicKey, number, string]>;
+export declare function getPoolPublicKeyForMint(hedgeProgramId: PublicKey, mintPublicKey: PublicKey): Promise<[PublicKey, number, string]>;
 /**
  *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type account
  */
-export declare function getVaultTypeAccountPublicKey(collateralType: string): Promise<PublicKey>;
+export declare function getVaultTypeAccountPublicKey(hedgeProgramId: PublicKey, collateralType: string): Promise<PublicKey>;
 /**
  *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type oracle info
  */
-export declare function getVaultTypeOracleAccountPublicKey(collateralType: string): Promise<PublicKey>;
+export declare function getVaultTypeOracleAccountPublicKey(hedgeProgramId: PublicKey, collateralType: string): Promise<PublicKey>;
 /**
  * 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 declare function findVaultAddress(vaultSalt: string): Promise<PublicKey>;
+export declare function findVaultAddress(hedgeProgramId: PublicKey, vaultSalt: string): Promise<PublicKey>;
 /**
  *
  * @param walletAddress Owner public key
  * @param tokenMintAddress Token mint
  * @returns The associated token account public key
  */
-export declare function findAssociatedTokenAddress(walletAddress: PublicKey, tokenMintAddress: PublicKey): Promise<PublicKey>;
+export declare function findAssociatedTokenAddress(hedgeProgramId: PublicKey, walletAddress: PublicKey, tokenMintAddress: PublicKey): Promise<PublicKey>;

package/declarations/idl/vault.d.ts

@@ -2413,33 +2413,54 @@ export declare type Vault = {
     "accounts": [
         {
             "name": "aggregator";
+            "docs": [
+                "Define the type of state stored in accounts"
+            ];
             "type": {
                 "kind": "struct";
                 "fields": [
                     {
                         "name": "isInitialized";
+                        "docs": [
+                            "Set to true after initialization."
+                        ];
                         "type": "bool";
                     },
                     {
                         "name": "version";
+                        "docs": [
+                            "Version of the state"
+                        ];
                         "type": "u32";
                     },
                     {
                         "name": "config";
+                        "docs": [
+                            "The configuration for this aggregator"
+                        ];
                         "type": {
                             "defined": "Config";
                         };
                     },
                     {
                         "name": "updatedAt";
+                        "docs": [
+                            "When the config was last updated."
+                        ];
                         "type": "i64";
                     },
                     {
                         "name": "owner";
+                        "docs": [
+                            "The aggregator owner is allowed to modify it's config."
+                        ];
                         "type": "publicKey";
                     },
                     {
                         "name": "submissions";
+                        "docs": [
+                            "A set of current submissions, one per oracle. Array index corresponds to oracle index."
+                        ];
                         "type": {
                             "array": [
                                 {
@@ -2451,6 +2472,9 @@ export declare type Vault = {
                     },
                     {
                         "name": "answer";
+                        "docs": [
+                            "The current median answer."
+                        ];
                         "type": {
                             "option": "u128";
                         };
@@ -3296,20 +3320,32 @@ export declare type Vault = {
                 "fields": [
                     {
                         "name": "oracles";
+                        "docs": [
+                            "A list of oracles allowed to submit answers."
+                        ];
                         "type": {
                             "vec": "publicKey";
                         };
                     },
                     {
                         "name": "minAnswerThreshold";
+                        "docs": [
+                            "Number of submissions required to produce an answer. Must be larger than 0."
+                        ];
                         "type": "u8";
                     },
                     {
                         "name": "stalenessThreshold";
+                        "docs": [
+                            "Offset in number of seconds before a submission is considered stale."
+                        ];
                         "type": "u8";
                     },
                     {
                         "name": "decimals";
+                        "docs": [
+                            "Decimal places for value representations"
+                        ];
                         "type": "u8";
                     }
                 ];

package/declarations/instructions/createReferralAccount.d.ts

@@ -12,6 +12,6 @@ import { Vault } from '../idl/vault';
  * - poolPublicKey: PublicKey : a key to a pool position. If the position is closed or does not belong to the signer it will be ignored
  * - referrer: PublicKey
  * - overrideTime?: number
-*/
+ */
 export declare function createReferralAccount(program: Program<Vault>, provider: Provider, payer: Signer, poolPosition: PublicKey, overrideTime?: number): Promise<PublicKey>;
 export declare function createReferralAccountInstruction(program: Program<Vault>, payerPublicKey: PublicKey, poolPositionPublicKey: PublicKey, referralAccountPublicKey: PublicKey, referralStatePublicKey: PublicKey, hedgeMintPublicKey: PublicKey, hdgAssociatedTokenAccountPublicKey: PublicKey, userReferralAccountPublicKey: PublicKey, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositLiquidationPool.d.ts

@@ -2,5 +2,5 @@
 import { BN, Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from '../idl/vault';
-export declare function depositLiquidationPool(program: Program<Vault>, provider: Provider, payer: Signer, depositAmount: BN, overrideStartTime?: number, referrer?: PublicKey): Promise<PublicKey>;
+export declare function depositLiquidationPool(program: Program<Vault>, provider: Provider, payer: Signer, depositAmount: number, overrideStartTime?: number, referrer?: PublicKey): Promise<PublicKey>;
 export declare function depositLiquidationPoolInstruction(program: Program<Vault>, payerPublicKey: PublicKey, vaultSystemStatePublicKey: PublicKey, payerUshAccount: PublicKey, poolPositionPublicKey: PublicKey, depositAmount: BN, userReferralAccountPublicKey: PublicKey, referralAccountPublicKey: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/referralClaimFees.d.ts

@@ -11,6 +11,6 @@ import { Vault } from '../idl/vault';
  * - payer: Signer : who we are creating the referral account for
  * - poolPublicKey: PublicKey : a key to a pool position. If the position is closed or does not belong to the signer it will be ignored
  * - referrer: PublicKey
-*/
+ */
 export declare function referralClaimFees(program: Program<Vault>, provider: Provider, payer: Signer, poolPosition: PublicKey): Promise<PublicKey>;
 export declare function referralClaimFeesInstruction(program: Program<Vault>, payerPublicKey: PublicKey, vaultSystemStatePublicKey: PublicKey, poolPositionPublicKey: PublicKey, referralAccountPublicKey: PublicKey, referralStatePublicKey: PublicKey, hedgeMintPublicKey: PublicKey, hdgAssociatedTokenAccountPublicKey: PublicKey, ushMintPublicKey: PublicKey, ushAssociatedTokenAccountPublicKey: PublicKey, communityAssociatedHedgeTokenAccountPublicKey: PublicKey, feePoolPublicKey: PublicKey, feePoolAssociatedUshTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;

package/declarations/utils/getLinkedListAccounts.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="bn.js" />
-import { Program, BN } from '@project-serum/anchor';
+import { BN, Program } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { VaultAccount } from '../state/VaultAccount';
 import { Vault } from '../idl/vault';
+import { VaultAccount } from '../state/VaultAccount';
 /**
  * Get the accounts the left and right for re-inserting in the linked list
  *

package/lib/Constants.js

@@ -9,21 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAssociatedTokenAddress = exports.findVaultAddress = exports.getVaultTypeOracleAccountPublicKey = exports.getVaultTypeAccountPublicKey = exports.getPoolPublicKeyForMint = exports.getHedgeMintPublicKey = exports.getUserReferralAccountPublicKey = exports.getReferralAccountPublicKey = exports.getReferralStatePublicKey = exports.getVaultSystemStatePublicKey = exports.getUshMintPublicKey = exports.getLiquidationPoolUshAccountPublicKey = exports.getLiquidationPoolStatePublicKey = exports.CHAINLINK_PROGRAM_ID = exports.CHAINLINK_SOL_USD_PUBLICKEY = exports.CHAINLINK_SOL_USD_ID = exports.HEDGE_PROGRAM_PUBLICKEY = exports.HEDGE_PROGRAM_ID = void 0;
+exports.findAssociatedTokenAddress = exports.findVaultAddress = exports.getVaultTypeOracleAccountPublicKey = exports.getVaultTypeAccountPublicKey = exports.getPoolPublicKeyForMint = exports.getHedgeMintPublicKey = exports.getUserReferralAccountPublicKey = exports.getReferralAccountPublicKey = exports.getReferralStatePublicKey = exports.getVaultSystemStatePublicKey = exports.getUshMintPublicKey = exports.getLiquidationPoolUshAccountPublicKey = exports.getLiquidationPoolStatePublicKey = exports.CHAINLINK_PROGRAM_ID = exports.CHAINLINK_SOL_USD_PUBLICKEY = exports.CHAINLINK_SOL_USD_ID = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-exports.HEDGE_PROGRAM_ID = 'HedgeEohwU6RqokrvPU4Hb6XKPub8NuKbnPmY7FoMMtN';
-exports.HEDGE_PROGRAM_PUBLICKEY = new web3_js_1.PublicKey(exports.HEDGE_PROGRAM_ID);
 exports.CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf';
 exports.CHAINLINK_SOL_USD_PUBLICKEY = new web3_js_1.PublicKey(exports.CHAINLINK_SOL_USD_ID);
-exports.CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
+exports.CHAINLINK_PROGRAM_ID = 'HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny';
 const enc = new TextEncoder();
 /**
  * @returns The Liquidation pool public key
  */
-function getLiquidationPoolStatePublicKey() {
+function getLiquidationPoolStatePublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], hedgeProgramId);
         return poolPublicKey;
     });
 }
@@ -32,9 +30,9 @@ exports.getLiquidationPoolStatePublicKey = getLiquidationPoolStatePublicKey;
  *
  * @returns The liquidation pool ush account public key
  */
-function getLiquidationPoolUshAccountPublicKey() {
+function getLiquidationPoolUshAccountPublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], hedgeProgramId);
         return poolPublicKey;
     });
 }
@@ -43,9 +41,9 @@ exports.getLiquidationPoolUshAccountPublicKey = getLiquidationPoolUshAccountPubl
  *
  * @returns The USH mint public key
  */
-function getUshMintPublicKey() {
+function getUshMintPublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [findMintPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('UshMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [findMintPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('UshMintV1')], hedgeProgramId);
         return findMintPublicKey;
     });
 }
@@ -54,9 +52,9 @@ exports.getUshMintPublicKey = getUshMintPublicKey;
  *
  * @returns The Vault System State public key
  */
-function getVaultSystemStatePublicKey() {
+function getVaultSystemStatePublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], hedgeProgramId);
         return publicKey;
     });
 }
@@ -65,9 +63,9 @@ exports.getVaultSystemStatePublicKey = getVaultSystemStatePublicKey;
  *
  * @returns The Referral State public key
  */
-function getReferralStatePublicKey() {
+function getReferralStatePublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('ReferralStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('ReferralStateV1')], hedgeProgramId);
         return publicKey;
     });
 }
@@ -76,10 +74,10 @@ exports.getReferralStatePublicKey = getReferralStatePublicKey;
  *
  * @returns The Referral State public key based off the owner's public key
  */
-function getReferralAccountPublicKey(ownerPublicKey) {
+function getReferralAccountPublicKey(hedgeProgramId, ownerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const strToEncode = ownerPublicKey.toBuffer(); //.substring(0, 28)
-        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('refer_acct'), strToEncode], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('refer_acct'), strToEncode], hedgeProgramId);
         return publicKey;
     });
 }
@@ -88,10 +86,10 @@ exports.getReferralAccountPublicKey = getReferralAccountPublicKey;
  *
  * @returns The user referral account public key based off the user's public key
  */
-function getUserReferralAccountPublicKey(ownerPublicKey) {
+function getUserReferralAccountPublicKey(hedgeProgramId, ownerPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const strToEncode = ownerPublicKey.toBuffer(); //.substring(0, 28)
-        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('user_ref'), strToEncode], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('user_ref'), strToEncode], hedgeProgramId);
         return publicKey;
     });
 }
@@ -100,9 +98,9 @@ exports.getUserReferralAccountPublicKey = getUserReferralAccountPublicKey;
  *
  * @returns The HDG mint public key
  */
-function getHedgeMintPublicKey() {
+function getHedgeMintPublicKey(hedgeProgramId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], hedgeProgramId);
         return publicKey;
     });
 }
@@ -113,10 +111,10 @@ exports.getHedgeMintPublicKey = getHedgeMintPublicKey;
  * @param mintPublicKey Staked collateral mint public key
  * @returns the public key for that staking pool
  */
-function getPoolPublicKeyForMint(mintPublicKey) {
+function getPoolPublicKeyForMint(hedgeProgramId, mintPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const strToEncode = mintPublicKey.toString().substring(0, 12);
-        const [publicKey, bump] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(strToEncode)], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [publicKey, bump] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(strToEncode)], hedgeProgramId);
         return [publicKey, bump, strToEncode];
     });
 }
@@ -126,9 +124,9 @@ exports.getPoolPublicKeyForMint = getPoolPublicKeyForMint;
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type account
  */
-function getVaultTypeAccountPublicKey(collateralType) {
+function getVaultTypeAccountPublicKey(hedgeProgramId, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], hedgeProgramId);
         return vaultTypeAccount;
     });
 }
@@ -138,9 +136,9 @@ exports.getVaultTypeAccountPublicKey = getVaultTypeAccountPublicKey;
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type oracle info
  */
-function getVaultTypeOracleAccountPublicKey(collateralType) {
+function getVaultTypeOracleAccountPublicKey(hedgeProgramId, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [vaultTypeOracleAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [vaultTypeOracleAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], hedgeProgramId);
         return vaultTypeOracleAccount;
     });
 }
@@ -151,9 +149,9 @@ exports.getVaultTypeOracleAccountPublicKey = getVaultTypeOracleAccountPublicKey;
  * @param vaultSalt String salt for the vault (must be 8 chars)
  * @returns The public key for that Vault Type oracle info
  */
-function findVaultAddress(vaultSalt) {
+function findVaultAddress(hedgeProgramId, vaultSalt) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [vaultAddress] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [vaultAddress] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], hedgeProgramId);
         return vaultAddress;
     });
 }
@@ -164,13 +162,9 @@ exports.findVaultAddress = findVaultAddress;
  * @param tokenMintAddress Token mint
  * @returns The associated token account public key
  */
-function findAssociatedTokenAddress(walletAddress, tokenMintAddress) {
+function findAssociatedTokenAddress(hedgeProgramId, walletAddress, tokenMintAddress) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield web3_js_1.PublicKey.findProgramAddress([
-            walletAddress.toBuffer(),
-            spl_token_1.TOKEN_PROGRAM_ID.toBuffer(),
-            tokenMintAddress.toBuffer(),
-        ], spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
+        return (yield web3_js_1.PublicKey.findProgramAddress([walletAddress.toBuffer(), spl_token_1.TOKEN_PROGRAM_ID.toBuffer(), tokenMintAddress.toBuffer()], spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
     });
 }
 exports.findAssociatedTokenAddress = findAssociatedTokenAddress;

package/lib/idl/vault.js

@@ -2416,33 +2416,54 @@ exports.IDL = {
     "accounts": [
         {
             "name": "aggregator",
+            "docs": [
+                "Define the type of state stored in accounts"
+            ],
             "type": {
                 "kind": "struct",
                 "fields": [
                     {
                         "name": "isInitialized",
+                        "docs": [
+                            "Set to true after initialization."
+                        ],
                         "type": "bool"
                     },
                     {
                         "name": "version",
+                        "docs": [
+                            "Version of the state"
+                        ],
                         "type": "u32"
                     },
                     {
                         "name": "config",
+                        "docs": [
+                            "The configuration for this aggregator"
+                        ],
                         "type": {
                             "defined": "Config"
                         }
                     },
                     {
                         "name": "updatedAt",
+                        "docs": [
+                            "When the config was last updated."
+                        ],
                         "type": "i64"
                     },
                     {
                         "name": "owner",
+                        "docs": [
+                            "The aggregator owner is allowed to modify it's config."
+                        ],
                         "type": "publicKey"
                     },
                     {
                         "name": "submissions",
+                        "docs": [
+                            "A set of current submissions, one per oracle. Array index corresponds to oracle index."
+                        ],
                         "type": {
                             "array": [
                                 {
@@ -2454,6 +2475,9 @@ exports.IDL = {
                     },
                     {
                         "name": "answer",
+                        "docs": [
+                            "The current median answer."
+                        ],
                         "type": {
                             "option": "u128"
                         }
@@ -3299,20 +3323,32 @@ exports.IDL = {
                 "fields": [
                     {
                         "name": "oracles",
+                        "docs": [
+                            "A list of oracles allowed to submit answers."
+                        ],
                         "type": {
                             "vec": "publicKey"
                         }
                     },
                     {
                         "name": "minAnswerThreshold",
+                        "docs": [
+                            "Number of submissions required to produce an answer. Must be larger than 0."
+                        ],
                         "type": "u8"
                     },
                     {
                         "name": "stalenessThreshold",
+                        "docs": [
+                            "Offset in number of seconds before a submission is considered stale."
+                        ],
                         "type": "u8"
                     },
                     {
                         "name": "decimals",
+                        "docs": [
+                            "Decimal places for value representations"
+                        ],
                         "type": "u8"
                     }
                 ]

package/lib/instructions/claimLiquidationPoolPosition.js

@@ -15,12 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimLiquidationPoolPositionInstruction = exports.claimLiquidationPoolPosition = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function claimLiquidationPoolPosition(program, provider, poolPosition, payer, collateralType, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccountPublicKey = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const collateralMintPublicKey = vaultTypeAccountInfo.collateralMint;
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMintPublicKey, payer.publicKey);
@@ -32,10 +32,12 @@ function claimLiquidationPoolPosition(program, provider, poolPosition, payer, co
 exports.claimLiquidationPoolPosition = claimLiquidationPoolPosition;
 function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolStatePublicKey, collateralMint);
-        return yield program.methods.claimLiquidationPoolPosition().accounts({
+        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
+        const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolStatePublicKey, collateralMint);
+        return yield program.methods
+            .claimLiquidationPoolPosition()
+            .accounts({
             vaultSystemState: vaultSystemState,
             poolState: poolStatePublicKey,
             poolAssociatedTokenAccount: poolAssociatedTokenAccount,
@@ -48,7 +50,8 @@ function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, coll
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             systemProgram: web3_js_1.SystemProgram.programId,
             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-        }).instruction();
+        })
+            .instruction();
     });
 }
 exports.claimLiquidationPoolPositionInstruction = claimLiquidationPoolPositionInstruction;

package/lib/instructions/claimStakingPoolPosition.js

@@ -15,16 +15,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimStakingPoolPositionInstruction = exports.claimStakingPoolPosition = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function claimStakingPoolPosition(program, provider, poolPosition, payer, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(program.programId, collateralType);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccount);
         const collateralMint = vaultTypeAccountInfo.collateralMint;
-        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(stakedTokenMint);
+        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(program.programId, stakedTokenMint);
         const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, feePool, true);
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount.address, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address));
@@ -35,7 +35,7 @@ function claimStakingPoolPosition(program, provider, poolPosition, payer, collat
 exports.claimStakingPoolPosition = claimStakingPoolPosition;
 function claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount) {
     return __awaiter(this, void 0, void 0, function* () {
-        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield program.methods
             .claimStakingPoolPosition()
             .accounts({

package/lib/instructions/closeClaimedLiquidationPoolPosition.js

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

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -16,29 +16,29 @@ exports.closeLiquidationPoolPositionInstruction = exports.closeLiquidationPoolPo
 const anchor_1 = require("@project-serum/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function closeLiquidationPoolPosition(program, provider, poolPosition, payer, overrideStartTime, referrer) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const referralStatePublicKey = yield (0, Constants_1.getReferralStatePublicKey)(program.programId);
         const liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
-        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
         const payerAssociatedHedgeAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, payer.publicKey);
         const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true);
         let referralAccountPublicKey = null;
         if (typeof referrer === 'undefined') {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(vaultSystemStatePublicKey);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, vaultSystemStatePublicKey);
         }
         else {
-            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(referrer);
+            referralAccountPublicKey = yield (0, Constants_1.getReferralAccountPublicKey)(program.programId, referrer);
         }
         // Derive the user referral account public key
-        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(payer.publicKey);
+        const userReferralAccountPublicKey = yield (0, Constants_1.getUserReferralAccountPublicKey)(program.programId, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUshAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, userReferralAccountPublicKey, referralAccountPublicKey, referralStatePublicKey, overrideStartTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition;
@@ -47,11 +47,11 @@ function closeLiquidationPoolPosition(program, provider, poolPosition, payer, ov
 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)();
-        const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
-        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
-        const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
-        const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMint = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)(program.programId);
+        const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)(program.programId);
         return yield program.methods
             .closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
         )