hedge-web3 0.1.13 → 0.1.16

package/lib/state/VaultAccount.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VaultAccount = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const HedgeDecimal_1 = require("../HedgeDecimal");
+/**
+ * A class that represents an on-chian vault.
+ */
+class VaultAccount {
+    constructor(vault, publicKey) {
+        this.publicKey = publicKey;
+        this.vaultOwner = vault.vaultOwner;
+        this.debt = vault.debt.toNumber();
+        this.deposited = vault.deposited.toNumber();
+        this.minCollateralRatio = (0, HedgeDecimal_1.DecimalFromU128)(vault.minCollateralRatio);
+        this.vaultStatus = Object.keys(vault.vaultStatus)[0];
+    }
+    /**
+     * Check if some `PublicKey` is the owner
+     *
+     * @param publicKey the publicKey to check against the vault owner
+     * @returns true if publicKey matches the owner publicKey
+     */
+    isOwnedBy(publicKey) {
+        return publicKey.toString() === this.vaultOwner.toString();
+    }
+    /**
+     * Get the collateral value in SOL
+     *
+     * @returns collateral value in SOL
+     */
+    inSol() {
+        return this.deposited / web3_js_1.LAMPORTS_PER_SOL;
+    }
+    /**
+     * Get the debt value in USDH
+     *
+     * @returns debt value in USDH
+     */
+    inUsd() {
+        return this.debt / web3_js_1.LAMPORTS_PER_SOL;
+    }
+    /**
+     * Pretty print the vault publickey for easy display
+     *
+     * @returns example: `1b6ca...azy71s`
+     */
+    toDisplayString() {
+        return `${this.publicKey.toString().substring(0, 6)}...${this.publicKey.toString().substring(this.publicKey.toString().length - 6)}`;
+    }
+}
+exports.VaultAccount = VaultAccount;

package/lib/state/VaultHistoryEvent.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VaultHistoryAction = exports.VaultStatus = exports.VaultHistoryEvent = void 0;
+const HedgeDecimal_1 = require("../HedgeDecimal");
+class VaultHistoryEvent {
+    constructor(account, publicKey) {
+        this.account = account;
+        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.minCollateralRatioBefore = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioBefore);
+        this.minCollateralRatioAfter = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioAfter);
+        this.vaultStateBefore = account.vaultStateBefore;
+        this.vaultStateAfter = account.vaultStateAfter;
+        this.timestamp = account.timestamp.toNumber();
+        this.action = account.action;
+    }
+}
+exports.VaultHistoryEvent = VaultHistoryEvent;
+var VaultStatus;
+(function (VaultStatus) {
+    VaultStatus[VaultStatus["Open"] = 0] = "Open";
+    VaultStatus[VaultStatus["Closed"] = 1] = "Closed";
+    VaultStatus[VaultStatus["Liquidated"] = 2] = "Liquidated";
+    VaultStatus[VaultStatus["Distributed"] = 3] = "Distributed";
+    VaultStatus[VaultStatus["Redeemed"] = 4] = "Redeemed";
+})(VaultStatus = exports.VaultStatus || (exports.VaultStatus = {}));
+var VaultHistoryAction;
+(function (VaultHistoryAction) {
+    VaultHistoryAction[VaultHistoryAction["Create"] = 0] = "Create";
+    VaultHistoryAction[VaultHistoryAction["Close"] = 1] = "Close";
+    VaultHistoryAction[VaultHistoryAction["Liquidate"] = 2] = "Liquidate";
+    VaultHistoryAction[VaultHistoryAction["PartialLiquidate"] = 3] = "PartialLiquidate";
+    VaultHistoryAction[VaultHistoryAction["Distributed"] = 4] = "Distributed";
+    VaultHistoryAction[VaultHistoryAction["Redeem"] = 5] = "Redeem";
+    VaultHistoryAction[VaultHistoryAction["TransferOwnership"] = 6] = "TransferOwnership";
+    VaultHistoryAction[VaultHistoryAction["Deposit"] = 7] = "Deposit";
+    VaultHistoryAction[VaultHistoryAction["Withdraw"] = 8] = "Withdraw";
+    VaultHistoryAction[VaultHistoryAction["Loan"] = 9] = "Loan";
+    VaultHistoryAction[VaultHistoryAction["RepayCredit"] = 10] = "RepayCredit";
+})(VaultHistoryAction = exports.VaultHistoryAction || (exports.VaultHistoryAction = {}));

package/lib/utils/Errors.js

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

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.13",
+  "version": "0.1.16",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "scripts": {
-    "build": "npm run clean; rollup -c",
+    "build": "tsc",
+    "dev": "tsc --watch",
     "clean": "rimraf ./lib",
-    "dev": "rollup -c -w",
     "docs": "set -ex; typedoc --includeVersion",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "Chris Coudron <coudron@gmail.com>",
+  "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "devDependencies": {
     "@rollup/plugin-typescript": "^8.3.0",
@@ -19,9 +19,15 @@
     "typedoc": "^0.22.10"
   },
   "dependencies": {
-    "@project-serum/anchor": "^0.19.1-beta.1",
-    "@solana/spl-token": "^0.1.8",
-    "@solana/web3.js": "^1.31.0",
-    "decimal.js": "^10.3.1"
+    "@project-serum/anchor": "^0.21.0",
+    "@project-serum/serum": "^0.13.61",
+    "@solana/buffer-layout": "^4.0.0",
+    "@solana/spl-token": "^0.2.0",
+    "@solana/web3.js": "^1.35.0",
+    "@types/uuid": "^8.3.4",
+    "bn.js": "^5.2.0",
+    "decimal.js": "^10.3.1",
+    "typescript": "^4.5.5",
+    "uuid": "^8.3.2"
   }
 }

package/src/Constants.ts

@@ -1,36 +1,37 @@
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'kkkBajjjT3rKjB3uGzSN83aLoQmaRwfXxbbBj8VLbtH'
+export const HEDGE_PROGRAM_ID = 'h4sPyjiRvWLquKRULRND9jHCPKqRYZZukvrjMZn21Pz'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 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, number]> {
-  const [poolPublicKey, bump] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], HEDGE_PROGRAM_PUBLICKEY)
-  return [poolPublicKey, bump]
+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, number]> {
-  const [poolPublicKey, bump] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSDHAccountV1')], HEDGE_PROGRAM_PUBLICKEY)
-  return [poolPublicKey, bump]
+export async function getLiquidationPoolUsdhAccountPublicKey (): Promise<PublicKey> {
+  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSDHAccountV1')], HEDGE_PROGRAM_PUBLICKEY)
+  return poolPublicKey
 }
 
-export async function getUsdhMintPublicKey (): Promise<[PublicKey, number]> {
-  const [findMintPublicKey, bump] = await PublicKey.findProgramAddress([enc.encode('UsdhMintV1')], HEDGE_PROGRAM_PUBLICKEY)
-  return [findMintPublicKey, bump]
+export async function getUsdhMintPublicKey (): Promise<PublicKey> {
+  const [findMintPublicKey] = await PublicKey.findProgramAddress([enc.encode('UsdhMintV1')], HEDGE_PROGRAM_PUBLICKEY)
+  return findMintPublicKey
 }
 
-export async function getVaultSystemStatePublicKey (): Promise<[PublicKey, number]> {
-  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], HEDGE_PROGRAM_PUBLICKEY)
-  return [publicKey, bump]
+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, number]> {
-  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], HEDGE_PROGRAM_PUBLICKEY)
-  return [publicKey, bump]
+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]> {
@@ -38,9 +39,13 @@ export async function getPoolPublicKeyForMint (mintPublicKey: PublicKey): Promis
   const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode(strToEncode)], HEDGE_PROGRAM_PUBLICKEY)
   return [publicKey, bump, strToEncode]
 }
-export async function getSolCollateralStateAccountPublicKey (): Promise<PublicKey> {
-  const [collateralStateAccount] = await PublicKey.findProgramAddress([enc.encode('SOL'), enc.encode('State')], HEDGE_PROGRAM_PUBLICKEY)
-  return collateralStateAccount
+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 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> {

package/src/HedgeDecimal.ts

@@ -5,14 +5,14 @@ import Decimal from 'decimal.js'
    *
    * On chain, u128s are used to store Decimal numbers. These values
    * are simply stored as u128 where the actual value is divided by
-   * 1.0e+24. This gives 24 digits of percision on decimal numbers.
+   * 1.0e+18. This gives 24 digits of percision on decimal numbers.
    *
-   * Example: the number 1.5 is stored as a u128: 1.5 * 10^24
+   * Example: the number 1.5 is stored as a u128: 1.5 * 10^18
    *
    * @param value the value to be converted to Decimal
    * @returns the converted value as a decimal.js object
    */
 export function DecimalFromU128 (value: number|string): Decimal {
   const adjustedValue = new Decimal(value.toString())
-  return adjustedValue.div(new Decimal('1e+24'))
+  return adjustedValue.div(new Decimal('1e+18'))
 }

package/src/idl/idl.ts

@@ -68,12 +68,12 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
         {
-          name: 'splAssociatedTokenProgramInfo',
+          name: 'associatedTokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -138,12 +138,12 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
         {
-          name: 'splAssociatedTokenProgramInfo',
+          name: 'associatedTokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -201,7 +201,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -286,7 +286,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -473,7 +473,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -528,7 +528,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -594,7 +594,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -653,7 +653,7 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -733,7 +733,7 @@ export const vaultIdl: Idl = {
           isSigner: true
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
@@ -799,12 +799,12 @@ export const vaultIdl: Idl = {
           isSigner: false
         },
         {
-          name: 'splTokenProgramInfo',
+          name: 'tokenProgram',
           isMut: false,
           isSigner: false
         },
         {
-          name: 'splAssociatedTokenProgramInfo',
+          name: 'associatedTokenProgram',
           isMut: false,
           isSigner: false
         },