Modify PRE operator schema's entity

schema.graphql

@@ -22,7 +22,7 @@ type StakeData @entity {
 type EpochStake @entity {
   # ID is the staking prov. add. + epoch counter
   id: ID!
-  stakingProvider: Bytes! # address
+  stakingProvider: Bytes!
   owner: Bytes!
   amount: BigInt!
 }
@@ -78,10 +78,13 @@ type TokenholderDelegation implements Delegation @entity {
   delegators: [Account!] @derivedFrom(field: "delegatee")
 }
 
-type ConfirmedOperator @entity {
+type SimplePREApplication @entity {
+  # ID is the staking provider address
   id: ID!
-  stakingProvider: Bytes! # address
-  operator: Bytes! # address
+  operator: Bytes!
+  stake: StakeData!
+  bondedTimestamp: BigInt!
+  confirmedTimestamp: BigInt
 }
 
 type DAOMetric @entity {

src/mapping.ts

@@ -1,11 +1,15 @@
 import {
+  store,
   crypto,
   ByteArray,
   BigInt,
   log,
   Address,
 } from "@graphprotocol/graph-ts"
-import { OperatorConfirmed } from "../generated/SimplePREApplication/SimplePREApplication"
+import {
+  OperatorBonded,
+  OperatorConfirmed,
+} from "../generated/SimplePREApplication/SimplePREApplication"
 import {
   Staked,
   ToppedUp,
@@ -19,7 +23,6 @@ import {
   StakeData,
   Epoch,
   EpochStake,
-  ConfirmedOperator,
   Account,
   MinStakeAmount,
 } from "../generated/schema"
@@ -32,6 +35,7 @@ import {
   increaseEpochCount,
   getOrCreateStakeDelegation,
   getOrCreateTokenholderDelegation,
+  getOrCreatePreApplication,
 } from "./utils"
 
 export function handleStaked(event: Staked): void {
@@ -64,8 +68,10 @@ export function handleStaked(event: Staked): void {
   stakeData.keepInTStake = type === "KEEP" ? amount : BigInt.zero()
   stakeData.nuInTStake = type === "NU" ? amount : BigInt.zero()
   stakeData.totalStaked = stakeData.tStake
-    .plus(stakeData.keepInTStake)
-    .plus(stakeData.nuInTStake)
+  stakeData.nuInTStake =
+    type === "NU"
+      ? amount
+      : BigInt.zero().plus(stakeData.keepInTStake).plus(stakeData.nuInTStake)
   stakeData.save()
 
   const lastEpoch = getOrCreateLastEpoch()
@@ -74,7 +80,7 @@ export function handleStaked(event: Staked): void {
   lastEpoch.save()
 
   const epochStakes = populateNewEpochStakes(lastEpoch.stakes)
-  const epochStakeId = getEpochStakeId(stakingProvider.toHexString())
+  const epochStakeId = getEpochStakeId(stakingProvider)
   const epochStake = new EpochStake(epochStakeId)
   epochStake.stakingProvider = stakingProvider
   epochStake.owner = owner
@@ -145,7 +151,7 @@ export function handleToppedUp(event: ToppedUp): void {
   lastEpoch.save()
 
   const epochStakes = populateNewEpochStakes(lastEpoch.stakes)
-  const epochStakeId = getEpochStakeId(stakingProvider.toHexString())
+  const epochStakeId = getEpochStakeId(stakingProvider)
   let epochStake = EpochStake.load(epochStakeId)
   if (!epochStake) {
     epochStake = new EpochStake(epochStakeId)
@@ -230,7 +236,7 @@ export function handleUnstaked(event: Unstaked): void {
   lastEpoch.save()
 
   const epochStakes = populateNewEpochStakes(lastEpoch.stakes)
-  const epochStakeId = getEpochStakeId(stakingProvider.toHexString())
+  const epochStakeId = getEpochStakeId(stakingProvider)
   const epochStake = EpochStake.load(epochStakeId)
   epochStake!.amount = epochStake!.amount.minus(amount)
   epochStake!.save()
@@ -280,16 +286,31 @@ export function handleDelegateVotesChanged(event: DelegateVotesChanged): void {
   daoMetric.save()
 }
 
-export function handleOperatorConfirmed(event: OperatorConfirmed): void {
-  let operator = ConfirmedOperator.load(
-    event.params.stakingProvider.toHexString()
-  )
-  if (!operator) {
-    operator = new ConfirmedOperator(event.params.stakingProvider.toHexString())
+export function handleOperatorBonded(event: OperatorBonded): void {
+  const stakingProvider = event.params.stakingProvider
+  const operator = event.params.operator
+  const timestamp = event.params.startTimestamp
+
+  const preApplication = getOrCreatePreApplication(stakingProvider)
+  if (operator === Address.zero()) {
+    store.remove("SimplePREApplication", stakingProvider.toHexString())
+  } else {
+    preApplication.operator = operator
+    preApplication.stake = stakingProvider.toHexString()
+    preApplication.bondedTimestamp = timestamp.plus(BigInt.fromString("12"))
+    preApplication.save()
   }
-  operator.stakingProvider = event.params.stakingProvider
-  operator.operator = event.params.operator
-  operator.save()
+}
+
+export function handleOperatorConfirmed(event: OperatorConfirmed): void {
+  const stakingProvider = event.params.stakingProvider
+  const operator = event.params.operator
+  const timestamp = event.block.timestamp
+
+  const preApplication = getOrCreatePreApplication(stakingProvider)
+  preApplication.operator = operator
+  preApplication.confirmedTimestamp = timestamp
+  preApplication.save()
 }
 
 export function handleMinStakeAmountChanged(

src/utils/applications.ts

@@ -0,0 +1,14 @@
+import { Address } from "@graphprotocol/graph-ts"
+import { SimplePREApplication } from "../../generated/schema"
+
+export function getOrCreatePreApplication(
+  stakingProvider: Address
+): SimplePREApplication {
+  const preApplication = SimplePREApplication.load(
+    stakingProvider.toHexString()
+  )
+
+  return !preApplication
+    ? new SimplePREApplication(stakingProvider.toHexString())
+    : preApplication
+}

src/utils/epochs.ts

@@ -1,12 +1,15 @@
-import { BigInt } from "@graphprotocol/graph-ts"
+import { Address, BigInt } from "@graphprotocol/graph-ts"
 import { Epoch, EpochStake, EpochCounter } from "../../generated/schema"
 
 const STAKING_CONTRACT_DEPLOY_TIMESTAMP = 1643633638
 const EPOCH_COUNTER_ID = "epoch-counter"
 
-export function getEpochStakeId(stakingProvider: string): string {
-  const epochCount = getEpochCount()
-  return `${stakingProvider}-${epochCount}`
+export function getEpochStakeId(
+  stakingProvider: Address,
+  epoch: i32 = -1
+): string {
+  const epochCount = epoch == -1 ? getEpochCount() : epoch
+  return `${stakingProvider.toHexString()}-${epochCount}`
 }
 
 export function getOrCreateLastEpoch(): Epoch {
@@ -27,7 +30,8 @@ export function getOrCreateLastEpoch(): Epoch {
 export function populateNewEpochStakes(stakes: string[]): string[] {
   for (let i = 0; i < stakes.length; i++) {
     const epochStake = EpochStake.load(stakes[i])
-    epochStake!.id = getEpochStakeId(epochStake!.stakingProvider.toHexString())
+    const stakingProvider = Address.fromBytes(epochStake!.stakingProvider)
+    epochStake!.id = getEpochStakeId(stakingProvider)
     epochStake!.save()
     stakes[i] = epochStake!.id
   }

src/utils/index.ts

@@ -1,2 +1,3 @@
 export * from "./delegations"
 export * from "./epochs"
+export * from "./applications"

subgraph.yaml

@@ -71,11 +71,13 @@ dataSources:
       apiVersion: 0.0.5
       language: wasm/assemblyscript
       entities:
-        - Operator
+        - SimplePREApplication
       abis:
         - name: SimplePREApplication
           file: ./abis/SimplePREApplication.json
       eventHandlers:
         - event: OperatorConfirmed(indexed address,indexed address)
           handler: handleOperatorConfirmed
+        - event: OperatorBonded(indexed address,indexed address,uint256)
+          handler: handleOperatorBonded
       file: ./src/mapping.ts