Removed rank on both staker and node.

Author: VGR-GIT

generated/schema.ts

@@ -143,7 +143,6 @@ export class Staker extends Entity {
     this.set("rETHBalance", Value.fromBigInt(BigInt.zero()));
     this.set("ethBalance", Value.fromBigInt(BigInt.zero()));
     this.set("totalETHRewards", Value.fromBigInt(BigInt.zero()));
-    this.set("totalETHRewardsRank", Value.fromBigInt(BigInt.zero()));
     this.set("hasAccruedETHRewardsDuringLifecycle", Value.fromBoolean(false));
     this.set("block", Value.fromBigInt(BigInt.zero()));
     this.set("blockTime", Value.fromBigInt(BigInt.zero()));
@@ -202,15 +201,6 @@ export class Staker extends Entity {
     this.set("totalETHRewards", Value.fromBigInt(value));
   }
 
-  get totalETHRewardsRank(): BigInt {
-    let value = this.get("totalETHRewardsRank");
-    return value!.toBigInt();
-  }
-
-  set totalETHRewardsRank(value: BigInt) {
-    this.set("totalETHRewardsRank", Value.fromBigInt(value));
-  }
-
   get hasAccruedETHRewardsDuringLifecycle(): boolean {
     let value = this.get("hasAccruedETHRewardsDuringLifecycle");
     return value!.toBoolean();
@@ -499,26 +489,6 @@ export class NetworkStakerBalanceCheckpoint extends Entity {
     this.set("averageStakerETHRewards", Value.fromBigInt(value));
   }
 
-  get checkpointWithHighestRewardsRank(): string | null {
-    let value = this.get("checkpointWithHighestRewardsRank");
-    if (!value || value.kind == ValueKind.NULL) {
-      return null;
-    } else {
-      return value.toString();
-    }
-  }
-
-  set checkpointWithHighestRewardsRank(value: string | null) {
-    if (!value) {
-      this.unset("checkpointWithHighestRewardsRank");
-    } else {
-      this.set(
-        "checkpointWithHighestRewardsRank",
-        Value.fromString(<string>value)
-      );
-    }
-  }
-
   get stakersWithAnRETHBalance(): BigInt {
     let value = this.get("stakersWithAnRETHBalance");
     return value!.toBigInt();
@@ -575,7 +545,6 @@ export class StakerBalanceCheckpoint extends Entity {
     this.set("ethBalance", Value.fromBigInt(BigInt.zero()));
     this.set("rETHBalance", Value.fromBigInt(BigInt.zero()));
     this.set("totalETHRewards", Value.fromBigInt(BigInt.zero()));
-    this.set("totalETHRewardsRank", Value.fromBigInt(BigInt.zero()));
     this.set("block", Value.fromBigInt(BigInt.zero()));
     this.set("blockTime", Value.fromBigInt(BigInt.zero()));
   }
@@ -656,15 +625,6 @@ export class StakerBalanceCheckpoint extends Entity {
     this.set("totalETHRewards", Value.fromBigInt(value));
   }
 
-  get totalETHRewardsRank(): BigInt {
-    let value = this.get("totalETHRewardsRank");
-    return value!.toBigInt();
-  }
-
-  set totalETHRewardsRank(value: BigInt) {
-    this.set("totalETHRewardsRank", Value.fromBigInt(value));
-  }
-
   get block(): BigInt {
     let value = this.get("block");
     return value!.toBigInt();
@@ -694,7 +654,6 @@ export class Node extends Entity {
     this.set("effectiveRPLStaked", Value.fromBigInt(BigInt.zero()));
     this.set("totalRPLSlashed", Value.fromBigInt(BigInt.zero()));
     this.set("totalClaimedRPLRewards", Value.fromBigInt(BigInt.zero()));
-    this.set("totalRPLClaimedRewardsRank", Value.fromBigInt(BigInt.zero()));
     this.set("minimumEffectiveRPL", Value.fromBigInt(BigInt.zero()));
     this.set("maximumEffectiveRPL", Value.fromBigInt(BigInt.zero()));
     this.set("queuedMinipools", Value.fromBigInt(BigInt.zero()));
@@ -779,15 +738,6 @@ export class Node extends Entity {
     this.set("totalClaimedRPLRewards", Value.fromBigInt(value));
   }
 
-  get totalRPLClaimedRewardsRank(): BigInt {
-    let value = this.get("totalRPLClaimedRewardsRank");
-    return value!.toBigInt();
-  }
-
-  set totalRPLClaimedRewardsRank(value: BigInt) {
-    this.set("totalRPLClaimedRewardsRank", Value.fromBigInt(value));
-  }
-
   get minimumEffectiveRPL(): BigInt {
     let value = this.get("minimumEffectiveRPL");
     return value!.toBigInt();
@@ -1530,26 +1480,6 @@ export class NetworkNodeBalanceCheckpoint extends Entity {
     this.set("totalClaimedRPLRewards", Value.fromBigInt(value));
   }
 
-  get checkpointWithHighestRPLRewardsRank(): string | null {
-    let value = this.get("checkpointWithHighestRPLRewardsRank");
-    if (!value || value.kind == ValueKind.NULL) {
-      return null;
-    } else {
-      return value.toString();
-    }
-  }
-
-  set checkpointWithHighestRPLRewardsRank(value: string | null) {
-    if (!value) {
-      this.unset("checkpointWithHighestRPLRewardsRank");
-    } else {
-      this.set(
-        "checkpointWithHighestRPLRewardsRank",
-        Value.fromString(<string>value)
-      );
-    }
-  }
-
   get rplPriceInETH(): BigInt {
     let value = this.get("rplPriceInETH");
     return value!.toBigInt();
@@ -1654,7 +1584,6 @@ export class NodeBalanceCheckpoint extends Entity {
     this.set("maximumEffectiveRPL", Value.fromBigInt(BigInt.zero()));
     this.set("totalRPLSlashed", Value.fromBigInt(BigInt.zero()));
     this.set("totalClaimedRPLRewards", Value.fromBigInt(BigInt.zero()));
-    this.set("totalRPLClaimedRewardsRank", Value.fromBigInt(BigInt.zero()));
     this.set("queuedMinipools", Value.fromBigInt(BigInt.zero()));
     this.set("stakingMinipools", Value.fromBigInt(BigInt.zero()));
     this.set("stakingUnbondedMinipools", Value.fromBigInt(BigInt.zero()));
@@ -1768,15 +1697,6 @@ export class NodeBalanceCheckpoint extends Entity {
     this.set("totalClaimedRPLRewards", Value.fromBigInt(value));
   }
 
-  get totalRPLClaimedRewardsRank(): BigInt {
-    let value = this.get("totalRPLClaimedRewardsRank");
-    return value!.toBigInt();
-  }
-
-  set totalRPLClaimedRewardsRank(value: BigInt) {
-    this.set("totalRPLClaimedRewardsRank", Value.fromBigInt(value));
-  }
-
   get queuedMinipools(): BigInt {
     let value = this.get("queuedMinipools");
     return value!.toBigInt();

schema.graphql

@@ -36,9 +36,6 @@ type Staker @entity {
   # Total ETH rewards (in WEI) accrued during the lifecycle of the staker. 
   totalETHRewards: BigInt!
 
-  # Current ETH reward rank of the staker based on his current total ETH rewards in comparison to the other stakers on the protocol.
-  totalETHRewardsRank: BigInt!
-
   # Indicates if this staker has accrued ETH rewards at some point in time during its lifetime.
   hasAccruedETHRewardsDuringLifecycle: Boolean!
 
@@ -108,9 +105,6 @@ type NetworkStakerBalanceCheckpoint @entity {
   # Average staker ETH rewards (+/-) (in WEI) up to this checkpoint.
   averageStakerETHRewards: BigInt!
 
-  # Staker checkpoint that had the highest total ETH reward rank at this checkpoint.
-  checkpointWithHighestRewardsRank: StakerBalanceCheckpoint
-
   # Total unique stakers that have an rETH balance (in WEI) greater than 0 at this checkpoint.
   stakersWithAnRETHBalance: BigInt!
 
@@ -147,9 +141,6 @@ type StakerBalanceCheckpoint @entity {
   # Total ETH rewards (in WEI) up to this checkpoint.
   totalETHRewards: BigInt!
 
-  # ETH reward rank of the staker based on his total ETH rewards at this checkpoint in comparison to the other stakers on the protocol.
-  totalETHRewardsRank: BigInt!
-
   # Block Number of this checkpoint.
   block: BigInt!
 
@@ -177,9 +168,6 @@ type Node @entity {
   # Total claimed RPL rewards since this node was registered with RocketPool.
   totalClaimedRPLRewards: BigInt!
 
-  # Current RPL reward rank of the node based on his total RPL rewards in comparison to the other nodes on the protocol.
-  totalRPLClaimedRewardsRank: BigInt!
-
   # Current minimum RPL needed to collateralize all staking minipools of this node by the bare minimum.
   minimumEffectiveRPL: BigInt!
 
@@ -377,9 +365,6 @@ type NetworkNodeBalanceCheckpoint @entity {
   # Total Claimed RPL rewards from all previous checkpoints up to this checkpoint.
   totalClaimedRPLRewards: BigInt!
 
-  # Node balance checkpoint that had the highest total RPL reward rank at this checkpoint.
-  checkpointWithHighestRPLRewardsRank: NodeBalanceCheckpoint
-
   # The RPL price in ETH at this checkpoint.
   rplPriceInETH: BigInt!
 
@@ -440,9 +425,6 @@ type NodeBalanceCheckpoint @entity {
   # Total Claimed RPL rewards up to this checkpoint.
   totalClaimedRPLRewards: BigInt!
 
-  # RPL reward rank of the node based on his total RPL rewards at this checkpoint in comparison to the other nodes on the protocol.
-  totalRPLClaimedRewardsRank: BigInt!
-
   # Queued minipools for this node at this checkpoint.
   queuedMinipools: BigInt!
 

src/entityfactory.ts

@@ -93,7 +93,6 @@ class RocketPoolEntityFactory {
     networkBalance.stakerETHInProtocol = event.params.totalEth;
     networkBalance.totalRETHSupply = event.params.rethSupply;
     networkBalance.averageStakerETHRewards = BigInt.fromI32(0);
-    networkBalance.checkpointWithHighestRewardsRank = null;
     networkBalance.rETHExchangeRate = rEthExchangeRate;
     networkBalance.block = event.block.number;
     networkBalance.blockTime = event.block.timestamp;
@@ -115,7 +114,6 @@ class RocketPoolEntityFactory {
     staker.rETHBalance = BigInt.fromI32(0);
     staker.ethBalance = BigInt.fromI32(0);
     staker.totalETHRewards = BigInt.fromI32(0);
-    staker.totalETHRewardsRank = BigInt.fromI32(0);
     staker.lastBalanceCheckpoint = null;
     staker.hasAccruedETHRewardsDuringLifecycle = false;
     staker.block = blockNumber;
@@ -154,10 +152,7 @@ class RocketPoolEntityFactory {
     stakerBalanceCheckpoint.rETHBalance = rEthBalance;
     stakerBalanceCheckpoint.totalETHRewards = totalETHRewards;
     stakerBalanceCheckpoint.block = blockNumber;
-    stakerBalanceCheckpoint.blockTime = blockTime;
-
-    // Set later based on other staker balance checkpoints in the same network checkpoint.
-    stakerBalanceCheckpoint.totalETHRewardsRank = BigInt.fromI32(0); 
+    stakerBalanceCheckpoint.blockTime = blockTime; 
 
     return stakerBalanceCheckpoint;
   }
@@ -190,7 +185,6 @@ class RocketPoolEntityFactory {
     node.maximumEffectiveRPL = BigInt.fromI32(0);
     node.totalRPLSlashed = BigInt.fromI32(0);
     node.totalClaimedRPLRewards = BigInt.fromI32(0);
-    node.totalRPLClaimedRewardsRank = BigInt.fromI32(0);
     node.queuedMinipools = BigInt.fromI32(0);
     node.stakingMinipools = BigInt.fromI32(0);
     node.stakingUnbondedMinipools = BigInt.fromI32(0);
@@ -320,7 +314,6 @@ class RocketPoolEntityFactory {
     checkpoint.maximumEffectiveRPL = BigInt.fromI32(0); // Will be calculated.
     checkpoint.totalRPLSlashed = BigInt.fromI32(0); // Will be calculated.
     checkpoint.totalClaimedRPLRewards = BigInt.fromI32(0); // Will be calculated.
-    checkpoint.checkpointWithHighestRPLRewardsRank = null; // Should be determined later.
     checkpoint.rplPriceInETH = newRplPriceInETH; // From the associated price update.
     checkpoint.queuedMinipools = BigInt.fromI32(0); // Will be calculated.
     checkpoint.stakingMinipools = BigInt.fromI32(0); // Will be calculated.
@@ -365,10 +358,6 @@ class RocketPoolEntityFactory {
     checkpoint.block = blockNumber;
     checkpoint.blockTime = blockTime;
 
-    // Unlike the staker total ETH rewards rank, the RPL rewards rank it kept up to date by the ETH1 chain every time rewards are claimed.
-    // That means we can just copy the state over from the node.
-    checkpoint.totalRPLClaimedRewardsRank = node.totalRPLClaimedRewardsRank;
-
     return checkpoint;
   }
 

src/mappings/rocketNetworkBalancesMapping.ts

@@ -138,9 +138,6 @@ function generateStakerBalanceCheckpoints(
     return
   }
 
-  let generatedStakerBalanceCheckpoints = new Array<StakerBalanceCheckpoint>()
-  let stakerBalanceCheckpointToStakerMap = new Map<string, Staker>()
-
   // Loop through all the staker id's in the protocol.
   for (let index = 0; index < stakerIds.length; index++) {
     // Determine current staker ID.
@@ -201,74 +198,6 @@ function generateStakerBalanceCheckpoints(
     // Index both the updated staker & the new staker balance checkpoint.
     stakerBalanceCheckpoint.save()
     staker.save()
-
-    // Keep track of all generated staker balance checkpoints.
-    generatedStakerBalanceCheckpoints.push(
-      <StakerBalanceCheckpoint>stakerBalanceCheckpoint,
-    )
-
-    // Keep track of the staker object that belongs to the node.
-    stakerBalanceCheckpointToStakerMap.set(
-      stakerBalanceCheckpoint.id,
-      <Staker>staker,
-    )
-  }
-
-  // If there were any staker balance checkpoints generated..
-  if (generatedStakerBalanceCheckpoints.length > 0) {
-    let sortedStakerBalanceCheckpointsByRank = generatedStakerBalanceCheckpoints.sort(
-      function (a, b) {
-        if(b.totalETHRewards > a.totalETHRewards) return 1;
-        else if(b.totalETHRewards < a.totalETHRewards) return -1;
-        else return 0;
-      },
-    )
-
-    // Set the rank of each staker balance checkpoint & store the checkpoint with the highest rank on the network checkpoint.
-    let rankIndex = 1
-    for (
-      let index = 0;
-      index < sortedStakerBalanceCheckpointsByRank.length;
-      index++
-    ) {
-      // Get the current staker balance checkpoint for this iteration.
-      let currentStakerBalanceCheckpoint =
-        sortedStakerBalanceCheckpointsByRank[index]
-      if (
-        currentStakerBalanceCheckpoint === null &&
-        stakerBalanceCheckpointToStakerMap.has(
-          currentStakerBalanceCheckpoint.id,
-        )
-      )
-        continue
-
-      // The rank of the staker in this checkpoint is the current index.
-      currentStakerBalanceCheckpoint.totalETHRewardsRank = BigInt.fromI32(
-        rankIndex,
-      )
-      currentStakerBalanceCheckpoint.save()
-
-      // Determine the associated staker
-      let associatedStaker = <Staker>(
-        stakerBalanceCheckpointToStakerMap.get(
-          currentStakerBalanceCheckpoint.id,
-        )
-      )
-      if (associatedStaker !== null) {
-        associatedStaker.totalETHRewardsRank =
-          currentStakerBalanceCheckpoint.totalETHRewardsRank
-        associatedStaker.save()
-      }
-
-      // If this was the first staker checkpoint, it has the highest rank and should be stored that way on the network staker balance checkpoint.
-      if (rankIndex === 1) {
-        networkCheckpoint.checkpointWithHighestRewardsRank =
-          currentStakerBalanceCheckpoint.id
-      }
-
-      // Update the rank index for the next staker(balance checkpoint).
-      rankIndex = rankIndex + 1
-    }
   }
 }
 

src/mappings/rocketNetworkPricesMapping.ts

@@ -160,12 +160,6 @@ function generateNodeBalanceCheckpoints(
     if (nodeBalanceCheckpoint == null) continue
     node.lastNodeBalanceCheckpoint = nodeBalanceCheckpoint.id
 
-    // Keep track of the highest RPL rewards claimed rank for this checkpoint.
-    if (node.totalRPLClaimedRewardsRank == BigInt.fromI32(1)) {
-      networkCheckpoint.checkpointWithHighestRPLRewardsRank =
-        nodeBalanceCheckpoint.id
-    }
-
     // Index both the updated node & the new node balance checkpoint.
     nodeBalanceCheckpoint.save()
     node.save()