hedge-web3 0.1.1 → 0.1.2

package/src/state/VaultHistoryEvent.ts

@@ -0,0 +1,61 @@
+
+import { PublicKey } from '@solana/web3.js'
+import Decimal from 'decimal.js'
+import { DecimalFromU128 } from '..'
+
+export class VaultHistoryEvent {
+  publicKey: PublicKey
+  actorAccount: PublicKey
+  usdSolPrice: Decimal
+  usdhDebtBefore: number
+  usdhDebtAfter: number
+  solBalanceBefore: number
+  solBalanceAfter: number
+  minCollateralRatioBefore: Decimal
+  minCollateralRatioAfter: Decimal
+  vaultStateBefore: PublicKey
+  vaultStateAfter: PublicKey
+  timestamp: PublicKey
+  action: VaultHistoryAction
+
+  constructor (public account: any, publicKey: PublicKey) {
+    this.publicKey = publicKey
+    this.actorAccount = account.actorAccount
+
+    this.usdSolPrice = 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 = DecimalFromU128(account.minCollateralRatioBefore)
+    this.minCollateralRatioAfter = DecimalFromU128(account.minCollateralRatioAfter)
+    this.vaultStateBefore = account.vaultStateBefore
+    this.vaultStateAfter = account.vaultStateAfter
+
+    this.timestamp = account.timestamp.toNumber()
+    this.action = account.action
+  }
+}
+
+export enum VaultStatus {
+  Open,
+  Closed,
+  Liquidated,
+  Distributed,
+  Redeemed,
+}
+
+export enum VaultHistoryAction {
+  Create,
+  Close,
+  Liquidate,
+  PartialLiquidate,
+  Distributed,
+  Redeem,
+  TransferOwnership,
+  Deposit,
+  Withdraw,
+  Loan,
+  RepayCredit,
+}

package/tsconfig.base.json

@@ -11,8 +11,6 @@
     "emitDecoratorMetadata": true,
     "noImplicitAny": false,
     "strictNullChecks": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
     "composite": true,
     "baseUrl": ".",
     "typeRoots": [
@@ -23,6 +21,8 @@
       "@solana/web3.js": [
         "./node_modules/@solana/web3.js/lib"
       ]
-    }
+    },
+    "resolveJsonModule": true,
+    "esModuleInterop": true 
   }
 }

package/tsconfig.d.json

@@ -2,7 +2,9 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "emitDeclarationOnly": true,
-    "stripInternal": true
+    "stripInternal": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
   },
   "include": [
     "./src/**/*"

package/tsconfig.json

@@ -14,7 +14,7 @@
     "isolatedModules": true,
     "baseUrl": "src",
     "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true
+    "noImplicitReturns": true,
   },
   "include": ["src"]
 }

package/typedoc.json

@@ -2,5 +2,6 @@
   "entryPoints": ["src/index.ts"],
   "excludeInternal": true,
   "excludePrivate": true,
-  "out": "doc"
+  "out": "doc",
+  "externalPattern": "./node_modules/**"
 }

package/src/accounts/LiquidationPoolEra.ts

@@ -1,16 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-
-// import { WAD } from './HedgeConstants'
-
-export class LiquidationPoolEra {
-  constructor (public liquidyPoolEra: any) {
-    //     this.totalDeposits = liquidyPoolEra.totalDeposits.toNumber()
-
-    //     this.product = byteArrayToFloat64(liquidyPoolEra.productBytes)
-    //     this.sum = byteArrayToFloat64(liquidyPoolEra.sumBytes)
-    //     this.hedgeRewardsAccumulator = byteArrayToFloat64(liquidyPoolEra.hedgeRewardsAccumulatorBytes)
-
-    //     this.hedgeRewardsTimestamp = liquidyPoolEra.hedgeRewardsTimestamp.toNumber()
-  }
-}

package/src/accounts/LiquidationPoolState.ts

@@ -1,22 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-
-// import { WAD } from './HedgeConstants'
-
-export class LiquidationPoolState {
-  constructor (public liquidationPoolState: any) {
-    //     this.lifetimeDeposits = liquidationPoolState.lifetimeDeposits.toNumber()
-    //     this.hedgeInitRewardsTimestamp = liquidationPoolState.hedgeInitRewardsTimestamp.toNumber()
-    //     // TODO Add the rest that are missing. Do we need them?
-  }
-
-//   getCurrentHedgeRewardsPerDay () {
-//     const dailyRate = hedgeRewardsDecay(
-//       2000000.0 * LAMPORTS_PER_SOL,
-//       this.hedgeInitRewardsTimestamp * 1000,
-//       Date.now(),
-//       Date.now() + (24 * 60 * 60 * 1000),
-//       365 * 1000)
-//     return dailyRate / LAMPORTS_PER_SOL
-//   }
-}

package/src/accounts/LiquidationPosition.ts

@@ -1,72 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-// import { LiquidationPoolEra, LiquidationPoolState } from '../Accounts';
-
-import { PublicKey } from '@solana/web3.js'
-import { LiquidationPoolEra } from './LiquidationPoolEra'
-import { LiquidationPoolState } from './LiquidationPoolState'
-
-// import { WAD } from './HedgeConstants'
-
-export class LiquidationPosition {
-//   publicKey: PublicKey;
-//   eraPublicKey: PublicKey;
-//   era: LiquidationPoolEra;
-//   liquidationPoolState: LiquidationPoolEra;
-//   ownerAccount: PublicKey;
-//   deposit: Decimal
-//   closedUsdh: Decimal
-//   closedSol: Decimal
-//   timestampOpened: Date
-//   timestampClosed: Date
-
-  //   productSnapshot: Decimal
-  //   sumSnapshot: Decimal
-  //   hedgeRewardsSnapshot: Decimal
-  //   open: Boolean
-
-  constructor (public poolPositionInfo: any, key: PublicKey, era: LiquidationPoolEra, liquidationPoolState: LiquidationPoolState) {
-    //     this.publicKey = key
-    //     this.eraPublicKey = poolPositionInfo.era
-    //     this.era = era
-    //     this.liquidationPoolState = liquidationPoolState
-    //     this.ownerAccount = poolPositionInfo.ownerAccount
-    //     this.deposit = poolPositionInfo.deposit.toNumber()
-    //     this.closedUsdh = poolPositionInfo.closedUsdh.toNumber()
-    //     this.closedSol = poolPositionInfo.closedSol.toNumber()
-    //     this.timestampOpened = poolPositionInfo.timestampOpened.toNumber()
-    //     this.timestampClosed = poolPositionInfo.timestampClosed.toNumber()
-
-    //     this.productSnapshot = new Decimal(poolPositionInfo.productSnapshotBytes.toString())
-    //     this.sumSnapshot = byteArrayToFloat64(poolPositionInfo.sumSnapshotBytes)
-    //     this.hedgeRewardsSnapshot = byteArrayToFloat64(poolPositionInfo.hedgeRewardsSnapshotAccum)
-    //     this.open = !!poolPositionInfo.state.open
-  }
-
-  //   getUsdhAvailable () {
-  //     return (this.deposit * (this.era.product / this.productSnapshot))
-  //   }
-
-  //   getSolAvailable () {
-  //     return Math.floor(this.deposit * ((this.era.sum - this.sumSnapshot) / this.productSnapshot))
-  //   }
-
-  //   getHedgeAvailable () {
-  //     const LiquidationPoolTotalSupply = 2000000.0 * LAMPORTS_PER_SOL
-  //     const hedgeRewardsSinceLastUpdate = hedgeRewardsDecay(
-  //       LiquidationPoolTotalSupply,
-  //       this.liquidationPoolState.hedgeInitRewardsTimestamp * 1000,
-  //       this.era.hedgeRewardsTimestamp * 1000,
-  //       Date.now(),
-  //       365 * 1000)
-
-  //     if (this.era.totalDeposits === 0) {
-  //       return 0
-  //     }
-
-//     const rewardsPerToken = hedgeRewardsSinceLastUpdate / this.era.totalDeposits * this.era.product
-//     const newAccumulator = this.era.hedgeRewardsAccumulator + rewardsPerToken
-//     const hedgeAvailable = (newAccumulator - this.hedgeRewardsSnapshot) * this.deposit / this.productSnapshot
-//     return hedgeAvailable
-//   }
-}

package/src/accounts/StakingPool.ts

@@ -1,31 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-
-import { PublicKey } from '@solana/web3.js';
-
-// import { WAD } from './HedgeConstants'
-
-export class StakingPool {
-  constructor (public poolInfo: any, key: PublicKey) {
-    //     this.publicKey = key
-    //     this.deposits = poolInfo.deposits.toNumber()
-    //     // this.totalFeesNow = poolInfo.totalFeesNow.toNumber()
-    //     // this.totalFeesPrevious = poolInfo.totalFeesPrevious.toNumber()
-    //     this.lastTransactionTime = poolInfo.lastTransactionTime.toNumber()
-    //     this.startTime = poolInfo.startTime.toNumber()
-    //     this.halfLifeInDays = poolInfo.halfLifeInDays.toNumber()
-    //     this.totalHedgeReward = poolInfo.totalHedgeReward.toNumber()
-
-    //     this.hedgeRewardAccumulator = byteArrayToFloat64(poolInfo.hedgeRewardAccumulator)
-    //     this.usdhFeeAccumulator = byteArrayToFloat64(poolInfo.usdhFeeAccumulator)
-    //     this.solFeeAccumulator = byteArrayToFloat64(poolInfo.solFeeAccumulator)
-    //     this.currentRewardsPerDay = byteArrayToFloat64(poolInfo.currentRewardsPerDay)
-
-    //     // "stakedTokenMint": { missing
-  }
-
-//   updateFeeAccumulator () {
-//     this.feeAccumulator = (this.totalFeesNow - this.totalFeesPrevious) / this.deposits
-//     this.totalFeesPrevious = this.totalFeesNow
-//   }
-}

package/src/accounts/StakingPoolPosition.ts

@@ -1,29 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-
-import { PublicKey } from '@solana/web3.js'
-import { StakingPool } from './StakingPool'
-
-// import { WAD } from './HedgeConstants'
-
-export class StakingPoolPosition {
-  constructor (public poolPositionInfo: any, key: PublicKey, stakingPool: StakingPool) {
-    //     this.open = !!poolPositionInfo.state.open
-    //     this.publicKey = key
-    //     this.pool = stakingPool
-    //     this.owner = poolPositionInfo.owner
-    //     this.deposited = poolPositionInfo.deposited.toNumber()
-    //     this.timestampOpened = poolPositionInfo.timestampOpened.toNumber()
-    //     this.timestampClosed = poolPositionInfo.timestampClosed.toNumber()
-    //     this.closedRewardedTokens = poolPositionInfo.closedRewardedTokens.toNumber()
-
-    //     this.startHedgeRewardAccumulator = byteArrayToFloat64(poolPositionInfo.startHedgeRewardAccumulator)
-    //     this.startUsdhFeeAccumulator = byteArrayToFloat64(poolPositionInfo.startUsdhFeeAccumulator)
-    //     this.startSolFeeAccumulator = byteArrayToFloat64(poolPositionInfo.startSolFeeAccumulator)
-  }
-
-//   getCurrentUsdhFeeReward () {
-//     const feesAccured = (this.pool.usdhFeeAccumulator - this.startUsdhFeeAccumulator) * this.deposited
-//     return feesAccured
-//   }
-}

package/src/accounts/VaultHistoryEvent.ts

@@ -1,27 +0,0 @@
-// import { LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js'
-// import Decimal from 'decimal.js'
-
-import { PublicKey } from '@solana/web3.js'
-
-// import { WAD } from './HedgeConstants'
-
-export class VaultHistoryEvent {
-  constructor (public account: any, publicKey: PublicKey) {
-    //     this.publicKey = publicKey
-    //     this.actorAccount = account.actorAccount
-
-    //     this.usdSolPrice = (new Decimal(account.usdSolPrice.toString())).dividedBy(WAD)
-
-    //     this.usdhDebtBefore = account.usdhDebtBefore.toNumber()
-    //     this.usdhDebtAfter = account.usdhDebtAfter.toNumber()
-    //     this.solBalanceBefore = account.solBalanceBefore.toNumber()
-    //     this.solBalanceAfter = account.solBalanceAfter.toNumber()
-    //     this.minCollateralRatioBefore = account.minCollateralRatioBefore.toNumber()
-    //     this.minCollateralRatioAfter = account.minCollateralRatioAfter.toNumber()
-    //     this.vaultStateBefore = Object.keys(account.vaultStateBefore)[0]
-    //     this.vaultStateAfter = Object.keys(account.vaultStateAfter)[0]
-
-    //     this.timestamp = account.timestamp.toNumber()
-    //     this.action = Object.keys(account.action)[0]
-  }
-}