hedge-web3 0.1.23 → 0.1.27

package/lib/state/StakingPool.js

@@ -14,7 +14,7 @@ class StakingPool {
         this.halfLifeInDays = poolInfo.halfLifeInDays.toNumber();
         this.totalHedgeReward = poolInfo.totalHedgeReward.toNumber();
         this.hedgeRewardAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.hedgeRewardAccumulator);
-        this.usdhFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.usdhFeeAccumulator);
+        this.ushFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.ushFeeAccumulator);
         this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum) => { return (0, HedgeDecimal_1.DecimalFromU128)(sum); });
         // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
     }

package/lib/state/StakingPoolPosition.js

@@ -17,12 +17,12 @@ class StakingPoolPosition {
         this.timestampClosed = poolPositionInfo.timestampClosed.toNumber();
         this.closedRewardedTokens = poolPositionInfo.closedRewardedTokens.toNumber();
         this.startHedgeRewardAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.startHedgeRewardAccumulator);
-        this.startUsdhFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.startUsdhFeeAccumulator);
+        this.startUshFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.startUshFeeAccumulator);
         this.startSolFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.startSolFeeAccumulator);
         this.open = poolPositionInfo.state.open !== undefined;
     }
-    getCurrentUsdhFeeReward() {
-        return this.pool.usdhFeeAccumulator.minus(this.startUsdhFeeAccumulator).times(new decimal_js_1.default(this.deposited));
+    getCurrentUshFeeReward() {
+        return this.pool.ushFeeAccumulator.minus(this.startUshFeeAccumulator).times(new decimal_js_1.default(this.deposited));
     }
 }
 exports.StakingPoolPosition = StakingPoolPosition;

package/lib/state/VaultAccount.js

@@ -36,9 +36,9 @@ class VaultAccount {
         return this.deposited / web3_js_1.LAMPORTS_PER_SOL;
     }
     /**
-     * Get the debt value in USDH
+     * Get the debt value in USH
      *
-     * @returns debt value in USDH
+     * @returns debt value in USH
      */
     inUsd() {
         return this.denormalizedDebt / web3_js_1.LAMPORTS_PER_SOL;

package/lib/state/VaultHistoryEvent.js

@@ -8,8 +8,8 @@ class VaultHistoryEvent {
         this.publicKey = publicKey;
         this.actorAccount = account.actorAccount;
         this.usdSolPrice = (0, HedgeDecimal_1.DecimalFromU128)(account.usdSolPrice.toString());
-        this.usdhDebtBefore = account.usdhDebtBefore.toNumber();
-        this.usdhDebtAfter = account.usdhDebtAfter.toNumber();
+        this.ushDebtBefore = account.ushDebtBefore.toNumber();
+        this.ushDebtAfter = account.ushDebtAfter.toNumber();
         this.collateralBalanceBefore = account.collateralBalanceBefore.toNumber();
         this.collateralBalanceAfter = account.collateralBalanceAfter.toNumber();
         this.minCollateralRatioBefore = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioBefore);

package/lib/utils/Errors.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAnchorErrors = void 0;
 const anchor_1 = require("@project-serum/anchor");
-const idl_1 = require("../idl/idl");
+const vault_1 = require("../idl/vault");
 function parseAnchorErrors(error) {
-    const idlErrors = (0, anchor_1.parseIdlErrors)(idl_1.vaultIdl);
+    const idlErrors = (0, anchor_1.parseIdlErrors)(vault_1.IDL);
     const parsedError = anchor_1.ProgramError.parse(error, idlErrors);
     if (parsedError !== null) {
         throw parsedError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.23",
+  "version": "0.1.27",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -13,21 +13,20 @@
   },
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
-  "devDependencies": {
-    "@rollup/plugin-typescript": "^8.3.0",
-    "rollup": "^2.62.0",
-    "ts-standard": "^11.0.0",
-    "typedoc": "^0.22.10"
-  },
   "dependencies": {
-    "@project-serum/anchor": "^0.21.0",
+    "@project-serum/anchor": "^0.23.0",
     "@project-serum/serum": "^0.13.61",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.35.0",
+    "@solana/web3.js": "^1.37.0",
+    "@types/bn.js": "^5.1.0",
     "@types/uuid": "^8.3.4",
     "bn.js": "^5.2.0",
     "decimal.js": "^10.3.1",
+    "rollup": "^2.62.0",
+    "ts-standard": "^11.0.0",
+    "typedoc": "^0.22.10",
     "typescript": "^4.5.5",
     "uuid": "^8.3.2"
   }

package/src/Constants.ts

@@ -1,64 +1,106 @@
-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 = 'h14ydGHkAt6vpBaxX461fgxGYsZjaf2K8Fqwm7Cn3ik'
+export const HEDGE_PROGRAM_ID = 'HDG2DRczYGkTuYTwTYy1UUhXXucT2Ujede2j4bWEoE6p'
 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)
 
 const enc = new TextEncoder()
 
-export async function getLiquidationPoolStatePublicKey (): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getLiquidationPoolStatePublicKey(): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress(
+    [enc.encode('LiquidationPoolStateV1')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return poolPublicKey
 }
 
-export async function getLiquidationPoolUsdhAccountPublicKey (): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSDHAccountV1')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getLiquidationPoolUshAccountPublicKey(): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress(
+    [enc.encode('LiquidationPoolUSHAccountV1')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return poolPublicKey
 }
 
-export async function getUsdhMintPublicKey (): Promise<PublicKey> {
-  const [findMintPublicKey] = await PublicKey.findProgramAddress([enc.encode('UsdhMintV1')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getUshMintPublicKey(): Promise<PublicKey> {
+  const [findMintPublicKey] = await PublicKey.findProgramAddress(
+    [enc.encode('UshMintV1')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return findMintPublicKey
 }
 
-export async function getVaultSystemStatePublicKey (): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getVaultSystemStatePublicKey(): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress(
+    [enc.encode('VaultSystemStateV1')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return publicKey
 }
 
-export async function getHedgeMintPublicKey (): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getHedgeMintPublicKey(): Promise<PublicKey> {
+  const [publicKey] = await PublicKey.findProgramAddress(
+    [enc.encode('HEDGEMintV1')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return publicKey
 }
 
-export async function getPoolPublicKeyForMint (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)
+export async function getPoolPublicKeyForMint(
+  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
+  )
   return [publicKey, bump, strToEncode]
 }
-export async function getVaultTypeAccountPublicKey (collateralType: string): Promise<PublicKey> {
-  const [vaultTypeAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getVaultTypeAccountPublicKey(
+  collateralType: string
+): Promise<PublicKey> {
+  const [vaultTypeAccount] = await PublicKey.findProgramAddress(
+    [enc.encode(collateralType), enc.encode('State')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return vaultTypeAccount
 }
-export async function getVaultTypeOracleAccountPublicKey (collateralType: string): Promise<PublicKey> {
-  const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], HEDGE_PROGRAM_PUBLICKEY)
+export async function getVaultTypeOracleAccountPublicKey(
+  collateralType: string
+): Promise<PublicKey> {
+  const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress(
+    [enc.encode(collateralType), enc.encode('Oracle')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return vaultTypeOracleAccount
 }
-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(vaultSalt: string): Promise<PublicKey> {
+  const [vaultAddress] = await PublicKey.findProgramAddress(
+    [enc.encode('Vault'), enc.encode(vaultSalt)],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
   return vaultAddress
 }
 
-export async function findAssociatedTokenAddress (walletAddress: PublicKey, tokenMintAddress: PublicKey): Promise<PublicKey> {
-  return (await PublicKey.findProgramAddress(
-    [
-      walletAddress.toBuffer(),
-      TOKEN_PROGRAM_ID.toBuffer(),
-      tokenMintAddress.toBuffer()
-    ],
-    ASSOCIATED_TOKEN_PROGRAM_ID
-  ))[0]
+export async function findAssociatedTokenAddress(
+  walletAddress: PublicKey,
+  tokenMintAddress: PublicKey
+): Promise<PublicKey> {
+  return (
+    await PublicKey.findProgramAddress(
+      [
+        walletAddress.toBuffer(),
+        TOKEN_PROGRAM_ID.toBuffer(),
+        tokenMintAddress.toBuffer(),
+      ],
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    )
+  )[0]
 }