Minor tweaks to staker contract (#1179)

Author: otherview

builtin/staker/housekeeping.go

@@ -174,7 +174,7 @@ func (s *Staker) activateValidators(currentBlock uint32) ([]*thor.Bytes32, error
 }
 
 func (s *Staker) Transition(currentBlock uint32) (bool, error) {
-	active, err := s.IsActive()
+	active, err := s.IsPoSActive()
 	if err != nil {
 		return false, err
 	}

builtin/staker/staker.go

@@ -57,8 +57,8 @@ func New(addr thor.Address, state *state.State, params *params.Params, charger *
 	}
 }
 
-// IsActive checks if the staker contract has become active, i.e. we have transitioned to PoS.
-func (s *Staker) IsActive() (bool, error) {
+// IsPoSActive checks if the staker contract has become active, i.e. we have transitioned to PoS.
+func (s *Staker) IsPoSActive() (bool, error) {
 	return s.validations.IsActive()
 }
 
@@ -130,8 +130,12 @@ func (s *Staker) AddValidator(
 	autoRenew bool,
 	currentBlock uint32,
 ) (thor.Bytes32, error) {
-	stakeETH := new(big.Int).Div(stake, big.NewInt(1e18))
-	logger.Debug("adding validator", "endorsor", endorsor, "node", node, "period", period, "stake", stakeETH, "autoRenew", autoRenew)
+	logger.Debug("adding validator", "endorsor", endorsor,
+		"node", node,
+		"period", period,
+		"stake", new(big.Int).Div(stake, big.NewInt(1e18)),
+		"autoRenew", autoRenew,
+	)
 
 	if id, err := s.validations.Add(endorsor, node, period, stake, autoRenew, currentBlock); err != nil {
 		logger.Info("add validator failed", "node", node, "error", err)

builtin/staker_native.go

@@ -67,7 +67,10 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			_, validationID, _ := Staker.NativeMetered(env.State(), charger).LookupNode(thor.Address(args.Node))
+			_, validationID, err := Staker.NativeMetered(env.State(), charger).LookupNode(thor.Address(args.Node))
+			if err != nil {
+				return []any{thor.Bytes32{}, fmt.Sprintf("revert: %v", err)}
+			}
 
 			return []any{validationID}
 		}},
@@ -145,12 +148,12 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			isActive, err := Staker.NativeMetered(env.State(), charger).IsActive()
+			isPoSActive, err := Staker.NativeMetered(env.State(), charger).IsPoSActive()
 			if err != nil {
 				return []any{thor.Bytes32{}, fmt.Sprintf("revert: %v", err)}
 			}
 
-			if !isActive {
+			if !isPoSActive {
 				charger.Charge(thor.SloadGas) // a.getEntry(nodeMaster)
 
 				exists, endorsor, _, _, err := Authority.Native(env.State()).Get(thor.Address(args.Node))
@@ -169,7 +172,8 @@ func init() {
 				AddValidator(
 					thor.Address(args.Endorsor),
 					thor.Address(args.Node),
-					args.Period, args.Stake,
+					args.Period,
+					args.Stake,
 					args.AutoRenew,
 					env.BlockContext().Number,
 				)
@@ -188,7 +192,12 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			err := Staker.NativeMetered(env.State(), charger).UpdateAutoRenew(thor.Address(args.Endorsor), thor.Bytes32(args.ValidationID), args.AutoRenew)
+			err := Staker.NativeMetered(env.State(), charger).
+				UpdateAutoRenew(
+					thor.Address(args.Endorsor),
+					thor.Bytes32(args.ValidationID),
+					args.AutoRenew,
+				)
 			if err != nil {
 				return []any{fmt.Sprintf("revert: %v", err)}
 			}
@@ -203,11 +212,16 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			err := Staker.NativeMetered(env.State(), charger).IncreaseStake(thor.Address(args.Endorsor), thor.Bytes32(args.ValidationID), args.Amount)
+			err := Staker.NativeMetered(env.State(), charger).
+				IncreaseStake(
+					thor.Address(args.Endorsor),
+					thor.Bytes32(args.ValidationID),
+					args.Amount,
+				)
 			if err != nil {
 				return []any{fmt.Sprintf("revert: %v", err)}
 			}
-			env.UseGas(thor.SstoreSetGas)
+
 			return []any{""}
 		}},
 		{"native_decreaseStake", func(env *xenv.Environment) []any {
@@ -219,7 +233,12 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			err := Staker.NativeMetered(env.State(), charger).DecreaseStake(thor.Address(args.Endorsor), thor.Bytes32(args.ValidationID), args.Amount)
+			err := Staker.NativeMetered(env.State(), charger).
+				DecreaseStake(
+					thor.Address(args.Endorsor),
+					thor.Bytes32(args.ValidationID),
+					args.Amount,
+				)
 			if err != nil {
 				return []any{fmt.Sprintf("revert: %v", err)}
 			}
@@ -235,7 +254,13 @@ func init() {
 			env.ParseArgs(&args)
 			charger := gascharger.New(env)
 
-			delegationID, err := Staker.NativeMetered(env.State(), charger).AddDelegation(thor.Bytes32(args.ValidationID), args.Stake, args.AutoRenew, args.Multiplier)
+			delegationID, err := Staker.NativeMetered(env.State(), charger).
+				AddDelegation(
+					thor.Bytes32(args.ValidationID),
+					args.Stake,
+					args.AutoRenew,
+					args.Multiplier,
+				)
 			if err != nil {
 				return []any{thor.Bytes32{}, fmt.Sprintf("revert: %v", err)}
 			}
@@ -281,7 +306,8 @@ func init() {
 			if err != nil {
 				return []any{thor.Bytes32{}, new(big.Int), uint32(0), uint32(0), uint8(0), false, false, fmt.Sprintf("revert: %v", err)}
 			}
-			var lastPeriod uint32 = math.MaxUint32
+
+			lastPeriod := uint32(math.MaxUint32)
 			if delegation.LastIteration != nil {
 				lastPeriod = *delegation.LastIteration
 			}
@@ -320,7 +346,7 @@ func init() {
 			charger.Charge(thor.SloadGas)
 			raw, err := Params.Native(env.State()).Get(thor.KeyStargateContractAddress)
 			if err != nil {
-				return []any{thor.Address{}, fmt.Sprintf("failed to get Stargate contract address: %v", err)}
+				return []any{thor.Address{}, fmt.Sprintf("revert: failed to get Stargate contract address: %v", err)}
 			}
 			addr := thor.BytesToAddress(raw.Bytes())
 			return []any{addr, ""}
@@ -334,7 +360,7 @@ func init() {
 
 			totals, err := Staker.NativeMetered(env.State(), charger).GetValidatorsTotals(thor.Bytes32(args.ValidationID))
 			if err != nil {
-				return []any{new(big.Int), new(big.Int), new(big.Int), new(big.Int), fmt.Sprintf("failed to validators totals: %v", err)}
+				return []any{new(big.Int), new(big.Int), new(big.Int), new(big.Int), fmt.Sprintf("revert: failed to get validators totals: %v", err)}
 			}
 			return []any{totals.TotalLockedStake, totals.TotalLockedWeight, totals.DelegationsLockedStake, totals.DelegationsLockedWeight, ""}
 		}},

consensus/validator.go

@@ -329,7 +329,7 @@ func (c *Consensus) syncPOS(staker *staker.Staker, current uint32) (active bool,
 		return false, false, nil, nil
 	}
 	// check if the staker contract is active
-	active, err = staker.IsActive()
+	active, err = staker.IsPoSActive()
 	if err != nil {
 		return false, false, nil, err
 	}

packer/packer.go

@@ -201,7 +201,7 @@ func (p *Packer) syncPOS(st *state.State, current uint32) (active bool, activate
 	}
 	// check if the staker contract currently is active
 	staker := builtin.Staker.Native(st)
-	active, err = staker.IsActive()
+	active, err = staker.IsPoSActive()
 	if err != nil {
 		return false, false, err
 	}