hedge-web3 0.1.23 → 0.1.27

package/declarations/instructions/closeLiquidationPoolPosition.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function closeLiquidationPoolPosition(program: Program, provider: Provider, poolPosition: PublicKey, payer: Signer, overrideStartTime?: number): Promise<PublicKey>;
-export declare function closeLiquidationPoolPositionInstruction(program: Program, poolEra: PublicKey, poolPosition: PublicKey, payerPublicKey: PublicKey, payerUsdhAccount: PublicKey, payerAssociatedHedgeAccount: PublicKey, communityAssociatedHedgeTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function closeLiquidationPoolPositionInstruction(program: Program, poolEra: PublicKey, poolPosition: PublicKey, payerPublicKey: PublicKey, payerUshAccount: PublicKey, payerAssociatedHedgeAccount: PublicKey, communityAssociatedHedgeTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/createVault.d.ts

@@ -2,4 +2,4 @@ import { Program, Provider } from "@project-serum/anchor";
 import { PublicKey, Signer, Transaction, TransactionInstruction } from "@solana/web3.js";
 export declare function createVault(program: Program, provider: Provider, payer: Signer, collateralType: string, depositAmount: number, overrideTime?: number): Promise<PublicKey>;
 export declare function buildCreateVaultTransaction(program: Program, collateralType: string, depositAmount: number, overrideTime?: number): Promise<[Transaction, Signer[], PublicKey]>;
-export declare function createVaultInstruction(program: Program, salt: string, payerPublicKey: PublicKey, payerTokenAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, feePool: PublicKey, feePoolAssociatedUsdhTokenAccount: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, historyPublicKey: PublicKey, usdhMintPublickey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function createVaultInstruction(program: Program, salt: string, payerPublicKey: PublicKey, payerTokenAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, feePool: PublicKey, feePoolAssociatedUshTokenAccount: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, historyPublicKey: PublicKey, ushMintPublickey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositLiquidationPool.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function depositLiquidationPool(program: Program, provider: Provider, payer: Signer, depositAmount: number, overrideStartTime?: number): Promise<PublicKey>;
-export declare function depositLiquidationPoolInstruction(program: Program, payerPublicKey: PublicKey, payerUsdhAccount: PublicKey, poolPositionPublicKey: PublicKey, depositAmount: number, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function depositLiquidationPoolInstruction(program: Program, payerPublicKey: PublicKey, payerUshAccount: PublicKey, poolPositionPublicKey: PublicKey, depositAmount: number, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/depositVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function depositVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, depositAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function depositVaultInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, vaultOwner: PublicKey, vaultOwnerTokenAccount: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccountPublicKey: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey, collateralMint: PublicKey, usdhMintPublickey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function depositVaultInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, vaultOwner: PublicKey, vaultOwnerTokenAccount: PublicKey, vaultPublicKey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccountPublicKey: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, ushMintPublickey: PublicKey, depositAmount: number, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/liquidateVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function liquidateVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, overrideTime?: number): Promise<PublicKey>;
-export declare function liquidateVaultInstruction(program: Program, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, collateralType: string, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function liquidateVaultInstruction(program: Program, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, collateralType: string, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/loanVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function loanVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, loanAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function loanVaultInstruction(program: Program, payerPublicKey: PublicKey, ownerUsdhAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, loanAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function loanVaultInstruction(program: Program, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, loanAmount: number, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/redeemVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function redeemVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, redeemAmount: number, transactionOverrideTime?: number): Promise<PublicKey>;
-export declare function redeemVaultInstruction(program: Program, payerPublicKey: PublicKey, payerUsdhAccount: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, redeemAmount: number, transactionOverrideTime?: number): Promise<TransactionInstruction>;
+export declare function redeemVaultInstruction(program: Program, payerPublicKey: PublicKey, payerUshAccount: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, redeemAmount: number, transactionOverrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/repayVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function repayVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, repayAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function repayVaultInstruction(program: Program, payerPublicKey: PublicKey, ownerUsdhAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, repayAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function repayVaultInstruction(program: Program, payerPublicKey: PublicKey, ownerUshAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, repayAmount: number, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/withdrawVault.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function withdrawVault(program: Program, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, withdrawAmount: number, overrideTime?: number): Promise<PublicKey>;
-export declare function withdrawVaultInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedCollateralPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey, usdhMint: PublicKey, historyPublicKey: PublicKey, withdrawAmount: number, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function withdrawVaultInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, destinationTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedCollateralPublicKey: PublicKey, vaultTypeAccount: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, hedgeStakingPoolPublicKey: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, ushMint: PublicKey, historyPublicKey: PublicKey, withdrawAmount: number, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/state/LiquidationPosition.d.ts

@@ -8,7 +8,7 @@ export declare class LiquidationPosition {
     liquidationPoolState?: LiquidationPoolState;
     ownerAccount: PublicKey;
     deposit: number;
-    closedUsdh: number;
+    closedUsh: number;
     timestampOpened: Date;
     timestampClosed: Date;
     productSnapshotEntry: Decimal;
@@ -18,6 +18,6 @@ export declare class LiquidationPosition {
     hedgeRewardsSnapshot: Decimal;
     open: boolean;
     constructor(poolPositionInfo: any, key: PublicKey);
-    getUsdhAvailable(era: LiquidationPoolEra): Decimal;
+    getUshAvailable(era: LiquidationPoolEra): Decimal;
     getTokensAvailable(era: LiquidationPoolEra, index: number): Decimal;
 }

package/declarations/state/StakingPool.d.ts

@@ -9,7 +9,7 @@ export declare class StakingPool {
     halfLifeInDays: number;
     totalHedgeReward: number;
     hedgeRewardAccumulator: Decimal;
-    usdhFeeAccumulator: Decimal;
+    ushFeeAccumulator: Decimal;
     collateralFeeAccumulator: [Decimal];
     constructor(poolInfo: any, publicKey: PublicKey);
 }

package/declarations/state/StakingPoolPosition.d.ts

@@ -11,9 +11,9 @@ export declare class StakingPoolPosition {
     timestampClosed: number;
     closedRewardedTokens: number;
     startHedgeRewardAccumulator: Decimal;
-    startUsdhFeeAccumulator: Decimal;
+    startUshFeeAccumulator: Decimal;
     startSolFeeAccumulator: Decimal;
     open: boolean;
     constructor(poolPositionInfo: any, key: PublicKey, stakingPool: StakingPool);
-    getCurrentUsdhFeeReward(): Decimal;
+    getCurrentUshFeeReward(): Decimal;
 }

package/declarations/state/VaultAccount.d.ts

@@ -12,7 +12,7 @@ export declare class VaultAccount {
     pdaSalt: string;
     /** The deposited collateral of the vault (in SOL Lamports). */
     deposited: number;
-    /** The outstanding debt of the vault (in USDH Lamports). Denormalized to time 0. */
+    /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
     denormalizedDebt: number;
     debtProductSnapshotBytes: Decimal;
     collateralAccumulatorSnapshotBytes: Decimal;
@@ -34,9 +34,9 @@ export declare class VaultAccount {
      */
     inSol(): number;
     /**
-     * Get the debt value in USDH
+     * Get the debt value in USH
      *
-     * @returns debt value in USDH
+     * @returns debt value in USH
      */
     inUsd(): number;
     /**

package/declarations/state/VaultHistoryEvent.d.ts

@@ -5,8 +5,8 @@ export declare class VaultHistoryEvent {
     publicKey: PublicKey;
     actorAccount: PublicKey;
     usdSolPrice: Decimal;
-    usdhDebtBefore: number;
-    usdhDebtAfter: number;
+    ushDebtBefore: number;
+    ushDebtAfter: number;
     collateralBalanceBefore: number;
     collateralBalanceAfter: number;
     minCollateralRatioBefore: Decimal;

package/lib/Constants.js

@@ -9,10 +9,10 @@ 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.getVaultSystemStatePublicKey = exports.getUsdhMintPublicKey = exports.getLiquidationPoolUsdhAccountPublicKey = exports.getLiquidationPoolStatePublicKey = 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.getVaultSystemStatePublicKey = exports.getUshMintPublicKey = exports.getLiquidationPoolUshAccountPublicKey = exports.getLiquidationPoolStatePublicKey = exports.CHAINLINK_SOL_USD_PUBLICKEY = exports.CHAINLINK_SOL_USD_ID = exports.HEDGE_PROGRAM_PUBLICKEY = exports.HEDGE_PROGRAM_ID = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-exports.HEDGE_PROGRAM_ID = 'h14ydGHkAt6vpBaxX461fgxGYsZjaf2K8Fqwm7Cn3ik';
+exports.HEDGE_PROGRAM_ID = 'HDG2DRczYGkTuYTwTYy1UUhXXucT2Ujede2j4bWEoE6p';
 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);
@@ -24,20 +24,20 @@ function getLiquidationPoolStatePublicKey() {
     });
 }
 exports.getLiquidationPoolStatePublicKey = getLiquidationPoolStatePublicKey;
-function getLiquidationPoolUsdhAccountPublicKey() {
+function getLiquidationPoolUshAccountPublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
-        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSDHAccountV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [poolPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
         return poolPublicKey;
     });
 }
-exports.getLiquidationPoolUsdhAccountPublicKey = getLiquidationPoolUsdhAccountPublicKey;
-function getUsdhMintPublicKey() {
+exports.getLiquidationPoolUshAccountPublicKey = getLiquidationPoolUshAccountPublicKey;
+function getUshMintPublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
-        const [findMintPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('UsdhMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        const [findMintPublicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('UshMintV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
         return findMintPublicKey;
     });
 }
-exports.getUsdhMintPublicKey = getUsdhMintPublicKey;
+exports.getUshMintPublicKey = getUshMintPublicKey;
 function getVaultSystemStatePublicKey() {
     return __awaiter(this, void 0, void 0, function* () {
         const [publicKey] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], exports.HEDGE_PROGRAM_PUBLICKEY);
@@ -54,7 +54,7 @@ function getHedgeMintPublicKey() {
 exports.getHedgeMintPublicKey = getHedgeMintPublicKey;
 function getPoolPublicKeyForMint(mintPublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
-        const strToEncode = (mintPublicKey.toString().substring(0, 12));
+        const strToEncode = mintPublicKey.toString().substring(0, 12);
         const [publicKey, bump] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(strToEncode)], exports.HEDGE_PROGRAM_PUBLICKEY);
         return [publicKey, bump, strToEncode];
     });
@@ -86,7 +86,7 @@ function findAssociatedTokenAddress(walletAddress, tokenMintAddress) {
         return (yield web3_js_1.PublicKey.findProgramAddress([
             walletAddress.toBuffer(),
             spl_token_1.TOKEN_PROGRAM_ID.toBuffer(),
-            tokenMintAddress.toBuffer()
+            tokenMintAddress.toBuffer(),
         ], spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
     });
 }