Merge pull request flare-foundation#47 from mboben/v1_10_0-upgrade

v1.10.0 upgrade - fixes and features

Author: mboben

avalanchego/vms/platformvm/service.go

@@ -8,6 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
+	"strings"
 	"time"
 
 	stdmath "math"
@@ -78,8 +80,16 @@ var (
 	errMissingPrivateKey        = errors.New("argument 'privateKey' not given")
 	errStartAfterEndTime        = errors.New("start time must be before end time")
 	errStartTimeInThePast       = errors.New("start time in the past")
+
+	completeGetValidators = false
 )
 
+func init() {
+	// if COMPLETE_GET_VALIDATORS is set to true, the getCurrentValidators API will return delegators
+	// for every node. Otherwise, it will only return delegators if a single nodeID is provided.
+	completeGetValidators = strings.ToUpper(os.Getenv("COMPLETE_GET_VALIDATORS")) == "TRUE"
+}
+
 // Service defines the API calls that can be made to the platform chain
 type Service struct {
 	vm                    *VM
@@ -881,8 +891,8 @@ func (s *Service) GetCurrentValidators(_ *http.Request, args *GetCurrentValidato
 		case txs.PrimaryNetworkDelegatorCurrentPriority, txs.SubnetPermissionlessDelegatorCurrentPriority:
 			var rewardOwner *platformapi.Owner
 			// If we are handling multiple nodeIDs, we don't return the
-			// delegator information.
-			if numNodeIDs == 1 {
+			// delegator information unless completeGetValidators is true.
+			if numNodeIDs == 1 || completeGetValidators {
 				attr, err := s.loadStakerTxAttributes(currentStaker.TxID)
 				if err != nil {
 					return err
@@ -941,8 +951,8 @@ func (s *Service) GetCurrentValidators(_ *http.Request, args *GetCurrentValidato
 		vdr.DelegatorCount = &delegatorCount
 		vdr.DelegatorWeight = &delegatorWeight
 
-		if numNodeIDs == 1 {
-			// queried a specific validator, load all of its delegators
+		if numNodeIDs == 1 || completeGetValidators {
+			// queried a specific validator or completeGetValidators is true, load all of its delegators
 			vdr.Delegators = &delegators
 		}
 		reply.Validators[i] = vdr

avalanchego/vms/platformvm/txs/executor/staker_tx_verification.go

@@ -462,6 +462,18 @@ func verifyAddPermissionlessValidatorTx(
 	}
 
 	currentTimestamp := chainState.GetTimestamp()
+	if constants.IsFlareNetworkID(backend.Ctx.NetworkID) || constants.IsSgbNetworkID(backend.Ctx.NetworkID) {
+		// Flare does not allow permissionless validator tx before Cortina
+		if currentTimestamp.Before(backend.Config.CortinaTime) {
+			return errWrongTxType
+		}
+
+		// Flare does not allow creation of subnets
+		if tx.Subnet != constants.PrimaryNetworkID {
+			return errWrongTxType
+		}
+	}
+
 	// Ensure the proposed validator starts after the current time
 	startTime := tx.StartTime()
 	if !currentTimestamp.Before(startTime) {
@@ -643,6 +655,11 @@ func verifyAddPermissionlessDelegatorTx(
 	}
 
 	currentTimestamp := chainState.GetTimestamp()
+	// Flare does not allow permissionless delegator tx before Cortina
+	if currentTimestamp.Before(backend.Config.CortinaTime) && (constants.IsFlareNetworkID(backend.Ctx.NetworkID) || constants.IsSgbNetworkID(backend.Ctx.NetworkID)) {
+		return errWrongTxType
+	}
+
 	// Ensure the proposed validator starts after the current timestamp
 	startTime := tx.StartTime()
 	if !currentTimestamp.Before(startTime) {

coreth/consensus/dummy/dynamic_fees.go

@@ -77,7 +77,7 @@ func CalcBaseFee(config *params.ChainConfig, parent *types.Header, timestamp uin
 	)
 	if isApricotPhase5 {
 		baseFeeChangeDenominator = ApricotPhase5BaseFeeChangeDenominator
-		if config.IsSongbirdCode() {
+		if config.IsSongbirdCode() && !config.IsCortina(bigTimestamp) {
 			parentGasTarget = params.SgbApricotPhase5TargetGas
 		} else {
 			parentGasTarget = params.ApricotPhase5TargetGas