hedge-web3 0.1.21 → 0.1.26

package/declarations/Constants.d.ts

@@ -1,11 +1,11 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const HEDGE_PROGRAM_ID = "h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3";
+export declare const HEDGE_PROGRAM_ID = "HDG1wzAC1G1XEHRBoQZGJBW4rVmxLZrPbk5ZHRxPWbXi";
 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 function getLiquidationPoolStatePublicKey(): Promise<PublicKey>;
-export declare function getLiquidationPoolUsdhAccountPublicKey(): Promise<PublicKey>;
-export declare function getUsdhMintPublicKey(): Promise<PublicKey>;
+export declare function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey>;
+export declare function getUshMintPublicKey(): Promise<PublicKey>;
 export declare function getVaultSystemStatePublicKey(): Promise<PublicKey>;
 export declare function getHedgeMintPublicKey(): Promise<PublicKey>;
 export declare function getPoolPublicKeyForMint(mintPublicKey: PublicKey): Promise<[PublicKey, number, string]>;

package/declarations/idl/vault.d.ts

@@ -21,7 +21,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "poolUsdhAccount";
+                    "name": "poolUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -31,7 +31,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -166,7 +166,7 @@ export declare type Vault = {
             "args": [];
         },
         {
-            "name": "setUsdhTokenMetadata";
+            "name": "setUshTokenMetadata";
             "accounts": [
                 {
                     "name": "metadataAccount";
@@ -212,7 +212,7 @@ export declare type Vault = {
             "args": [];
         },
         {
-            "name": "updateUsdhTokenMetadata";
+            "name": "updateUshTokenMetadata";
             "accounts": [
                 {
                     "name": "metadataAccount";
@@ -281,7 +281,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": false;
                     "isSigner": false;
                 },
@@ -291,7 +291,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "poolAssociatedUsdhTokenAccount";
+                    "name": "poolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -419,7 +419,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": false;
                     "isSigner": false;
                 },
@@ -434,7 +434,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "payerAssociatedUsdhAccount";
+                    "name": "payerAssociatedUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -444,7 +444,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "poolAssociatedUsdhTokenAccount";
+                    "name": "poolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -500,12 +500,12 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -599,12 +599,12 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -684,7 +684,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -704,7 +704,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -769,12 +769,12 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -784,7 +784,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "ownerUsdhAccount";
+                    "name": "ownerUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -844,7 +844,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -854,7 +854,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -864,7 +864,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "ownerUsdhAccount";
+                    "name": "ownerUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -924,7 +924,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -934,7 +934,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -944,7 +944,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "payerUsdhAccount";
+                    "name": "payerUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -966,7 +966,7 @@ export declare type Vault = {
             ];
             "args": [
                 {
-                    "name": "redeemPayUsdh";
+                    "name": "redeemPayUsh";
                     "type": "u64";
                 },
                 {
@@ -984,7 +984,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "poolUsdhAccount";
+                    "name": "poolUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -999,7 +999,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1009,7 +1009,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "ownerUsdhAccount";
+                    "name": "ownerUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1089,17 +1089,17 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "liquidationPoolUsdhAccount";
+                    "name": "liquidationPoolUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1205,17 +1205,17 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "feePoolAssociatedUsdhTokenAccount";
+                    "name": "feePoolAssociatedUshTokenAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "liquidationPoolUsdhAccount";
+                    "name": "liquidationPoolUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
                 {
-                    "name": "usdhMint";
+                    "name": "ushMint";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1296,7 +1296,7 @@ export declare type Vault = {
                     "isSigner": false;
                 },
                 {
-                    "name": "poolUsdhAccount";
+                    "name": "poolUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1306,7 +1306,7 @@ export declare type Vault = {
                     "isSigner": true;
                 },
                 {
-                    "name": "ownerUsdhAccount";
+                    "name": "ownerUshAccount";
                     "isMut": true;
                     "isSigner": false;
                 },
@@ -1559,7 +1559,7 @@ export declare type Vault = {
                         "type": "u128";
                     },
                     {
-                        "name": "usdhFeeAccumulator";
+                        "name": "ushFeeAccumulator";
                         "type": "u128";
                     },
                     {
@@ -1617,7 +1617,7 @@ export declare type Vault = {
                         "type": "u128";
                     },
                     {
-                        "name": "startUsdhFeeAccumulator";
+                        "name": "startUshFeeAccumulator";
                         "type": "u128";
                     },
                     {
@@ -1653,7 +1653,7 @@ export declare type Vault = {
                         "type": "i64";
                     },
                     {
-                        "name": "totalUsdhSupply";
+                        "name": "totalUshSupply";
                         "type": "u64";
                     },
                     {
@@ -1757,11 +1757,11 @@ export declare type Vault = {
                         "type": "u128";
                     },
                     {
-                        "name": "usdhDebtBefore";
+                        "name": "ushDebtBefore";
                         "type": "u64";
                     },
                     {
-                        "name": "usdhDebtAfter";
+                        "name": "ushDebtAfter";
                         "type": "u64";
                     },
                     {
@@ -1900,7 +1900,7 @@ export declare type Vault = {
                         "type": "u64";
                     },
                     {
-                        "name": "closedUsdh";
+                        "name": "closedUsh";
                         "type": "u64";
                     },
                     {
@@ -2150,7 +2150,7 @@ export declare type Vault = {
                         "name": "Solana";
                     },
                     {
-                        "name": "Usdh";
+                        "name": "Ush";
                     }
                 ];
             };

package/declarations/index.d.ts

@@ -1,6 +1,7 @@
 export * from './instructions/createStakingPool';
 export * from './instructions/depositStakingPool';
 export * from './instructions/withdrawStakingPool';
+export * from './instructions/claimStakingPoolPosition';
 export * from './instructions/depositLiquidationPool';
 export * from './instructions/closeLiquidationPoolPosition';
 export * from './instructions/claimLiquidationPoolPosition';

package/declarations/instructions/claimStakingPoolPosition.d.ts

@@ -0,0 +1,4 @@
+import { Program, Provider } from '@project-serum/anchor';
+import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
+export declare function claimStakingPoolPosition(program: Program, provider: Provider, poolPosition: PublicKey, payer: Signer, collateralType: string): Promise<PublicKey>;
+export declare function claimStakingPoolPositionInstruction(program: Program, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, stakedTokenMint: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, poolPosition: PublicKey, payer: PublicKey, payerAssociatedTokenAccount: PublicKey): Promise<TransactionInstruction>;

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;
-    solFeeAccumulator: 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,10 +5,10 @@ export declare class VaultHistoryEvent {
     publicKey: PublicKey;
     actorAccount: PublicKey;
     usdSolPrice: Decimal;
-    usdhDebtBefore: number;
-    usdhDebtAfter: number;
-    solBalanceBefore: number;
-    solBalanceAfter: number;
+    ushDebtBefore: number;
+    ushDebtAfter: number;
+    collateralBalanceBefore: number;
+    collateralBalanceAfter: number;
     minCollateralRatioBefore: Decimal;
     minCollateralRatioAfter: Decimal;
     vaultStateBefore: PublicKey;

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 = 'h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3';
+exports.HEDGE_PROGRAM_ID = 'HDG1wzAC1G1XEHRBoQZGJBW4rVmxLZrPbk5ZHRxPWbXi';
 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);