hedge-web3 0.1.21 → 0.1.26

package/lib/instructions/withdrawVault.js

@@ -17,9 +17,9 @@ const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
-        // Prep the user to get USDH back out at some point
-        yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        // Prep the user to get USH back out at some point
+        yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const history = web3_js_1.Keypair.generate();
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
@@ -29,14 +29,14 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccount, true);
         const destinationTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
-        const hedgeStakingPoolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, usdhMintPublickey);
-        const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultTypeAccount, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount, usdhMintPublickey, history.publicKey, withdrawAmount, overrideTime));
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultTypeAccount, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, withdrawAmount, overrideTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
         return vaultPublicKey;
     });
 }
 exports.withdrawVault = withdrawVault;
-function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUsdhTokenAccount, usdhMint, historyPublicKey, withdrawAmount, overrideTime) {
+function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMint, historyPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         return program.instruction.withdrawVault(new anchor_1.BN(withdrawAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
         {
@@ -47,8 +47,8 @@ function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPubli
                 vault: vaultPublickey,
                 vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
                 feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-                usdhMint: usdhMint,
+                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+                ushMint: ushMint,
                 history: historyPublicKey,
                 vaultOwner: payerPublicKey,
                 destinationTokenAccount: destinationTokenAccount,

package/lib/state/LiquidationPosition.js

@@ -12,7 +12,7 @@ class LiquidationPosition {
         this.eraPublicKey = poolPositionInfo.era;
         this.ownerAccount = poolPositionInfo.ownerAccount;
         this.deposit = poolPositionInfo.deposit.toNumber();
-        this.closedUsdh = poolPositionInfo.closedUsdh.toNumber();
+        this.closedUsh = poolPositionInfo.closedUsh.toNumber();
         this.timestampOpened = poolPositionInfo.timestampOpened.toNumber();
         this.timestampClosed = poolPositionInfo.timestampClosed.toNumber();
         this.productSnapshotEntry = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.productSnapshotEntry);
@@ -23,7 +23,7 @@ class LiquidationPosition {
         this.open = poolPositionInfo.state === 1;
         console.log("poolPositionInfo.state, poolPositionInfo.state");
     }
-    getUsdhAvailable(era) {
+    getUshAvailable(era) {
         return (era.product.div(this.productSnapshotEntry)).mul(new decimal_js_1.default(this.deposit));
     }
     getTokensAvailable(era, index) {

package/lib/state/StakingPool.js

@@ -14,8 +14,8 @@ 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.solFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.solFeeAccumulator);
+        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,10 +8,10 @@ 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.solBalanceBefore = account.solBalanceBefore.toNumber();
-        this.solBalanceAfter = account.solBalanceAfter.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);
         this.minCollateralRatioAfter = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioAfter);
         this.vaultStateBefore = account.vaultStateBefore;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.21",
+  "version": "0.1.26",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
+  "types": "declarations/index.d.ts",
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
@@ -12,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,7 +1,7 @@
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3'
+export const HEDGE_PROGRAM_ID = 'HDG1wzAC1G1XEHRBoQZGJBW4rVmxLZrPbk5ZHRxPWbXi'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
@@ -14,13 +14,13 @@ export async function getLiquidationPoolStatePublicKey (): Promise<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
 }
 

package/src/idl/idl.ts

@@ -23,7 +23,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'poolUsdhAccount',
+          name: 'poolUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -33,7 +33,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: true,
           isSigner: false
         },
@@ -118,7 +118,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: false,
           isSigner: false
         },
@@ -128,7 +128,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'poolAssociatedUsdhTokenAccount',
+          name: 'poolAssociatedUshTokenAccount',
           isMut: true,
           isSigner: false
         },
@@ -256,7 +256,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: false,
           isSigner: false
         },
@@ -271,7 +271,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'payerAssociatedUsdhAccount',
+          name: 'payerAssociatedUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -281,7 +281,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'poolAssociatedUsdhTokenAccount',
+          name: 'poolAssociatedUshTokenAccount',
           isMut: true,
           isSigner: false
         },
@@ -448,12 +448,12 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'feePoolAssociatedUsdhTokenAccount',
+          name: 'feePoolAssociatedUshTokenAccount',
           isMut: true,
           isSigner: false
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: true,
           isSigner: false
         },
@@ -463,7 +463,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'ownerUsdhAccount',
+          name: 'ownerUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -513,7 +513,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: true,
           isSigner: false
         },
@@ -523,7 +523,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'ownerUsdhAccount',
+          name: 'ownerUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -564,7 +564,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: true,
           isSigner: false
         },
@@ -574,7 +574,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'feePoolAssociatedUsdhTokenAccount',
+          name: 'feePoolAssociatedUshTokenAccount',
           isMut: true,
           isSigner: false
         },
@@ -584,7 +584,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'payerUsdhAccount',
+          name: 'payerUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -606,7 +606,7 @@ export const vaultIdl: Idl = {
       ],
       args: [
         {
-          name: 'redeemPayUsdh',
+          name: 'redeemPayUsh',
           type: 'u64'
         },
         {
@@ -628,7 +628,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'poolUsdhAccount',
+          name: 'poolUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -648,7 +648,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'ownerUsdhAccount',
+          name: 'ownerUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -698,12 +698,12 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'poolUsdhAccount',
+          name: 'poolUshAccount',
           isMut: true,
           isSigner: false
         },
         {
-          name: 'usdhMint',
+          name: 'ushMint',
           isMut: true,
           isSigner: false
         },
@@ -769,7 +769,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'poolUsdhAccount',
+          name: 'poolUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -779,7 +779,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'ownerUsdhAccount',
+          name: 'ownerUshAccount',
           isMut: true,
           isSigner: false
         },
@@ -845,7 +845,7 @@ export const vaultIdl: Idl = {
             type: 'u128'
           },
           {
-            name: 'usdhFeeAccumulator',
+            name: 'ushFeeAccumulator',
             type: 'u128'
           },
           {
@@ -903,7 +903,7 @@ export const vaultIdl: Idl = {
             type: 'u128'
           },
           {
-            name: 'startUsdhFeeAccumulator',
+            name: 'startUshFeeAccumulator',
             type: 'u128'
           },
           {
@@ -943,7 +943,7 @@ export const vaultIdl: Idl = {
             type: 'u64'
           },
           {
-            name: 'totalUsdhSupply',
+            name: 'totalUshSupply',
             type: 'u64'
           },
           {
@@ -979,7 +979,7 @@ export const vaultIdl: Idl = {
             type: 'u8'
           },
           {
-            name: 'bumpUsdhPoolAccount',
+            name: 'bumpUshPoolAccount',
             type: 'u8'
           },
           {
@@ -1081,11 +1081,11 @@ export const vaultIdl: Idl = {
             type: 'u128'
           },
           {
-            name: 'usdhDebtBefore',
+            name: 'ushDebtBefore',
             type: 'u64'
           },
           {
-            name: 'usdhDebtAfter',
+            name: 'ushDebtAfter',
             type: 'u64'
           },
           {
@@ -1229,7 +1229,7 @@ export const vaultIdl: Idl = {
             type: 'u64'
           },
           {
-            name: 'closedUsdh',
+            name: 'closedUsh',
             type: 'u64'
           },
           {
@@ -1369,7 +1369,7 @@ export const vaultIdl: Idl = {
             name: 'Solana'
           },
           {
-            name: 'Usdh'
+            name: 'Ush'
           }
         ]
       }