Fixed struct tags, added saturn check to pre-saturn rplStakeThreshold calc

Author: thomaspanf

rocketpool/api/node/status.go

@@ -510,15 +510,16 @@ func getStatus(c *cli.Context) (*api.NodeStatusResponse, error) {
 			return nil, err
 		}
 
-		// Calculate the *real* maximum, including the pending bond reductions
-		trueRplStakeThreshold := eth.EthToWei(32)
-		trueRplStakeThreshold.Mul(trueRplStakeThreshold, big.NewInt(int64(totalActiveValidators)))
-		trueRplStakeThreshold.Sub(trueRplStakeThreshold, response.EthBorrowed)
-		trueRplStakeThreshold.Sub(trueRplStakeThreshold, response.PendingBorrowAmount) // (32 * totalActiveValidators - ethBorrowed - pendingBorrow)
-		trueRplStakeThreshold.Mul(trueRplStakeThreshold, rplStakeThresholdFraction)
-		trueRplStakeThreshold.Div(trueRplStakeThreshold, rplPrice)
-
-		response.RplStakeThreshold = trueRplStakeThreshold
+		if !saturnDeployed {
+			// Calculate the *real* maximum, including the pending bond reductions
+			trueRplStakeThreshold := eth.EthToWei(32)
+			trueRplStakeThreshold.Mul(trueRplStakeThreshold, big.NewInt(int64(totalActiveValidators)))
+			trueRplStakeThreshold.Sub(trueRplStakeThreshold, response.EthBorrowed)
+			trueRplStakeThreshold.Sub(trueRplStakeThreshold, response.PendingBorrowAmount) // (32 * totalActiveValidators - ethBorrowed - pendingBorrow)
+			trueRplStakeThreshold.Mul(trueRplStakeThreshold, rplStakeThresholdFraction)
+			trueRplStakeThreshold.Div(trueRplStakeThreshold, rplPrice)
+			response.RplStakeThreshold = trueRplStakeThreshold
+		}
 
 		response.BondedCollateralRatio = eth.WeiToEth(rplPrice) * eth.WeiToEth(response.TotalRplStake) / (float64(totalActiveValidators)*32.0 - eth.WeiToEth(response.EthBorrowed) - eth.WeiToEth(response.PendingBorrowAmount))
 		response.BorrowedCollateralRatio = eth.WeiToEth(rplPrice) * eth.WeiToEth(response.TotalRplStake) / (eth.WeiToEth(response.EthBorrowed) + eth.WeiToEth(response.PendingBorrowAmount))

shared/types/api/node.go

@@ -40,8 +40,8 @@ type NodeStatusResponse struct {
 	TotalRplStake                            *big.Int        `json:"totalRplStake"`
 	RplStakeMegapool                         *big.Int        `json:"rplStakeMegapool"`
 	RplStakeLegacy                           *big.Int        `json:"rplStakeLegacy"`
-	RplStakeThreshold                        *big.Int        `json:"maximumRplStake"`
-	RplStakeThresholdFraction                float64         `json:"maximumStakeFraction"`
+	RplStakeThreshold                        *big.Int        `json:"rplStakeThreshold"`
+	RplStakeThresholdFraction                float64         `json:"rplStakeThresholdFraction"`
 	BorrowedCollateralRatio                  float64         `json:"borrowedCollateralRatio"`
 	BondedCollateralRatio                    float64         `json:"bondedCollateralRatio"`
 	PendingMinimumRplStake                   *big.Int        `json:"pendingMinimumRplStake"`