Merge pull request #982 from jshufro/jms/v11-updates

Delete v8, fix v9-10 and v11

Author: 0xfornax

bindings/utils/state/node.go

@@ -29,7 +29,6 @@ type NativeNodeDetails struct {
 	FeeDistributorInitialised        bool           `json:"fee_distributor_initialised"`
 	FeeDistributorAddress            common.Address `json:"fee_distributor_address"`
 	RewardNetwork                    *big.Int       `json:"reward_network"`
-	RplStake                         *big.Int       `json:"rpl_stake"`
 	EffectiveRPLStake                *big.Int       `json:"effective_rpl_stake"`
 	MinimumRPLStake                  *big.Int       `json:"minimum_rpl_stake"`
 	MaximumRPLStake                  *big.Int       `json:"maximum_rpl_stake"`
@@ -355,7 +354,7 @@ func addNodeDetailsCalls(contracts *NetworkContracts, mc *multicall.MultiCaller,
 	mc.AddCall(contracts.RocketNodeDistributorFactory, &details.FeeDistributorAddress, "getProxyAddress", address)
 	mc.AddCall(contracts.RocketNodeManager, &details.RewardNetwork, "getRewardNetwork", address)
 	if !contracts.isSaturnDeployed() {
-		mc.AddCall(contracts.RocketNodeStaking, &details.RplStake, "getNodeRPLStake", address)
+		mc.AddCall(contracts.RocketNodeStaking, &details.LegacyStakedRPL, "getNodeRPLStake", address)
 		mc.AddCall(contracts.RocketNodeStaking, &details.EffectiveRPLStake, "getNodeEffectiveRPLStake", address)
 		mc.AddCall(contracts.RocketNodeStaking, &details.MinimumRPLStake, "getNodeMinimumRPLStake", address)
 		mc.AddCall(contracts.RocketNodeStaking, &details.MaximumRPLStake, "getNodeMaximumRPLStake", address)
@@ -391,8 +390,6 @@ func addNodeDetailsCalls(contracts *NetworkContracts, mc *multicall.MultiCaller,
 		mc.AddCall(contracts.RocketNodeStaking, &details.MegapoolEthBonded, "getNodeMegapoolETHBonded", address)
 		// the amount of a node operator's minipool bonded ETH
 		mc.AddCall(contracts.RocketNodeStaking, &details.MinipoolETHBonded, "getNodeMinipoolETHBonded", address)
-		// the total amount of RPL staked by a node operator (both legacy and megapool staked RPL)
-		mc.AddCall(contracts.RocketNodeStaking, &details.RplStake, "getNodeStakedRPL", address)
 		// the amount of megapool staked RPL for a node operator
 		mc.AddCall(contracts.RocketNodeStaking, &details.MegapoolStakedRPL, "getNodeMegapoolStakedRPL", address)
 		// the amount of legacy staked RPL for a node operator

rocketpool/node/collectors/node-collector.go

@@ -269,7 +269,7 @@ func (collector *NodeCollector) Collect(channel chan<- prometheus.Metric) {
 
 	// Sync
 	var wg errgroup.Group
-	stakedRpl := eth.WeiToEth(nd.RplStake)
+	stakedRpl := eth.WeiToEth(nd.LegacyStakedRPL) // TODO: update all metrics to account for saturn
 	effectiveStakedRpl := eth.WeiToEth(nd.EffectiveRPLStake)
 	rewardsInterval := state.NetworkDetails.IntervalDuration
 	inflationInterval := state.NetworkDetails.RPLInflationIntervalRate
@@ -280,7 +280,7 @@ func (collector *NodeCollector) Collect(channel chan<- prometheus.Metric) {
 	oldRplBalance := eth.WeiToEth(nd.BalanceOldRPL)
 	newRplBalance := eth.WeiToEth(nd.BalanceRPL)
 	rethBalance := eth.WeiToEth(nd.BalanceRETH)
-	eligibleBorrowedEth := state.GetEligibleBorrowedEth(nd)
+	eligibleBorrowedEth := state.GetMinipoolEligibleBorrowedEth(nd)
 	var activeMinipoolCount float64
 	rplPriceRaw := state.NetworkDetails.RplPrice
 	rplPrice := eth.WeiToEth(rplPriceRaw)
@@ -443,8 +443,8 @@ func (collector *NodeCollector) Collect(channel chan<- prometheus.Metric) {
 
 	nodeWeight := big.NewInt(0)
 	// The node must satisfy collateral requirements and have eligible ETH from which to earn rewards.
-	if nd.RplStake.Cmp(minCollateral) != -1 && eligibleBorrowedEth.Sign() > 0 {
-		nodeWeight = state.GetNodeWeight(eligibleBorrowedEth, nd.RplStake)
+	if nd.LegacyStakedRPL.Cmp(minCollateral) != -1 && eligibleBorrowedEth.Sign() > 0 {
+		nodeWeight = state.GetNodeWeight(eligibleBorrowedEth, nd.LegacyStakedRPL)
 	}
 
 	// Calculate the rewardable RPL
@@ -510,7 +510,7 @@ func (collector *NodeCollector) Collect(channel chan<- prometheus.Metric) {
 	rewardableMaximumStake.Div(rewardableMaximumStake, rplPriceRaw)
 
 	// Calculate the actual "rewardable" amount
-	rewardableRplStake := big.NewInt(0).Set(nd.RplStake)
+	rewardableRplStake := big.NewInt(0).Set(nd.LegacyStakedRPL)
 	if rewardableRplStake.Cmp(rewardableMinimumStake) < 0 {
 		rewardableRplStake.SetUint64(0)
 	} else if rewardableRplStake.Cmp(rewardableMaximumStake) > 0 {

shared/services/rewards/generator-impl-v11.go

@@ -549,8 +549,7 @@ func (r *treeGeneratorImpl_v11) calculateEthRewards(checkBeaconPerformance bool)
 		for _, nodeInfo := range r.nodeDetails {
 			// Check if the node is currently opted in for simplicity
 			if nodeInfo.IsEligible && nodeInfo.IsOptedIn && r.elEndTime.After(nodeInfo.OptInTime) {
-				eligibleBorrowedEth := nodeInfo.EligibleBorrowedEth
-				_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(eligibleBorrowedEth, nodeInfo.RplStake)
+				_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(nodeInfo.MinipoolEligibleBorrowedEth, nodeInfo.LegacyStakedRpl)
 				for _, minipool := range nodeInfo.Minipools {
 					minipool.CompletedAttestations = map[uint64]bool{0: true}
 
@@ -789,8 +788,7 @@ func (r *treeGeneratorImpl_v11) calculateNodeBonuses() (*big.Int, error) {
 		}
 
 		// Get the nodeDetails from the network state
-		eligibleBorrowedEth := nsd.EligibleBorrowedEth
-		_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(eligibleBorrowedEth, nsd.RplStake)
+		_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(nsd.MinipoolEligibleBorrowedEth, nsd.LegacyStakedRpl)
 		for _, mpd := range nsd.Minipools {
 			mpi := r.networkState.MinipoolDetailsByAddress[mpd.Address]
 			if !mpi.IsEligibleForBonuses(eligibleEnd) {
@@ -1250,13 +1248,12 @@ func (r *treeGeneratorImpl_v11) checkAttestations(attestations []beacon.Attestat
 					continue
 				}
 
-				eligibleBorrowedEth := nodeDetails.EligibleBorrowedEth
-				_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(eligibleBorrowedEth, nodeDetails.RplStake)
-
 				// Mark this duty as completed
 				positionInfo.MarkAttestationCompleted(attestation.SlotIndex)
 
 				if positionInfo.MinipoolInfo != nil {
+					_, percentOfBorrowedEth := r.networkState.GetStakedRplValueInEthAndPercentOfBorrowedEth(nodeDetails.MinipoolEligibleBorrowedEth, nodeDetails.LegacyStakedRpl)
+
 					validator := positionInfo.MinipoolInfo
 
 					// Get the pseudoscore for this attestation
@@ -1572,7 +1569,8 @@ func (r *treeGeneratorImpl_v11) getSmoothingPoolNodeDetails() error {
 					SmoothingPoolEth:        big.NewInt(0),
 					BonusEth:                big.NewInt(0),
 					RewardsNetwork:          nativeNodeDetails.RewardNetwork.Uint64(),
-					RplStake:                nativeNodeDetails.RplStake,
+					LegacyStakedRpl:         nativeNodeDetails.LegacyStakedRPL,
+					MegapoolStakedRpl:       nativeNodeDetails.MegapoolStakedRPL,
 					MegapoolVoteEligibleRpl: big.NewInt(0),
 					VoterShareEth:           big.NewInt(0),
 				}
@@ -1693,7 +1691,7 @@ func (r *treeGeneratorImpl_v11) getSmoothingPoolNodeDetails() error {
 	// Populate the eligible borrowed ETH field for all nodes
 	for _, nodeDetails := range r.nodeDetails {
 		nnd := r.networkState.NodeDetailsByAddress[nodeDetails.Address]
-		nodeDetails.EligibleBorrowedEth = r.networkState.GetEligibleBorrowedEth(nnd)
+		nodeDetails.MinipoolEligibleBorrowedEth = r.networkState.GetMinipoolEligibleBorrowedEth(nnd)
 	}
 
 	return nil