ACP-77: Update ConvertSubnetTx

snow/engine/snowman/engine.go

@@ -176,7 +176,7 @@ func (e *Engine) Gossip(ctx context.Context) error {
 	// nodes with a large amount of stake weight.
 	vdrID, ok := e.ConnectedValidators.SampleValidator()
 	if !ok {
-		e.Ctx.Log.Warn("skipping block gossip",
+		e.Ctx.Log.Debug("skipping block gossip",
 			zap.String("reason", "no connected validators"),
 		)
 		return nil

vms/platformvm/txs/convert_subnet_tx.go

@@ -8,18 +8,26 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/vms/components/verify"
+	"github.com/ava-labs/avalanchego/vms/platformvm/fx"
+	"github.com/ava-labs/avalanchego/vms/platformvm/signer"
 	"github.com/ava-labs/avalanchego/vms/types"
 )
 
 const MaxSubnetAddressLength = 4096
 
 var (
-	_ UnsignedTx = (*TransferSubnetOwnershipTx)(nil)
+	_ UnsignedTx                             = (*ConvertSubnetTx)(nil)
+	_ utils.Sortable[ConvertSubnetValidator] = ConvertSubnetValidator{}
 
-	ErrConvertPermissionlessSubnet = errors.New("cannot convert a permissionless subnet")
-	ErrAddressTooLong              = errors.New("address is too long")
+	ErrConvertPermissionlessSubnet         = errors.New("cannot convert a permissionless subnet")
+	ErrAddressTooLong                      = errors.New("address is too long")
+	ErrConvertMustIncludeValidators        = errors.New("conversion must include at least one validator")
+	ErrConvertValidatorsNotSortedAndUnique = errors.New("conversion validators must be sorted and unique")
+	ErrZeroWeight                          = errors.New("validator weight must be non-zero")
+	ErrMissingPublicKey                    = errors.New("missing public key")
 )
 
 type ConvertSubnetTx struct {
@@ -31,6 +39,8 @@ type ConvertSubnetTx struct {
 	ChainID ids.ID `serialize:"true" json:"chainID"`
 	// Address of the Subnet manager
 	Address types.JSONByteSlice `serialize:"true" json:"address"`
+	// Initial pay-as-you-go validators for the Subnet
+	Validators []ConvertSubnetValidator `serialize:"true" json:"validators"`
 	// Authorizes this conversion
 	SubnetAuth verify.Verifiable `serialize:"true" json:"subnetAuthorization"`
 }
@@ -46,11 +56,20 @@ func (tx *ConvertSubnetTx) SyntacticVerify(ctx *snow.Context) error {
 		return ErrConvertPermissionlessSubnet
 	case len(tx.Address) > MaxSubnetAddressLength:
 		return ErrAddressTooLong
+	case len(tx.Validators) == 0:
+		return ErrConvertMustIncludeValidators
+	case !utils.IsSortedAndUnique(tx.Validators):
+		return ErrConvertValidatorsNotSortedAndUnique
 	}
 
 	if err := tx.BaseTx.SyntacticVerify(ctx); err != nil {
 		return err
 	}
+	for _, vdr := range tx.Validators {
+		if err := vdr.Verify(); err != nil {
+			return err
+		}
+	}
 	if err := tx.SubnetAuth.Verify(); err != nil {
 		return err
 	}
@@ -62,3 +81,37 @@ func (tx *ConvertSubnetTx) SyntacticVerify(ctx *snow.Context) error {
 func (tx *ConvertSubnetTx) Visit(visitor Visitor) error {
 	return visitor.ConvertSubnetTx(tx)
 }
+
+type ConvertSubnetValidator struct {
+	// TODO: Must be Ed25519 NodeID
+	NodeID ids.NodeID `serialize:"true" json:"nodeID"`
+	// Weight of this validator used when sampling
+	Weight uint64 `serialize:"true" json:"weight"`
+	// Initial balance for this validator
+	Balance uint64 `serialize:"true" json:"balance"`
+	// [Signer] is the BLS key for this validator.
+	// Note: We do not enforce that the BLS key is unique across all validators.
+	//       This means that validators can share a key if they so choose.
+	//       However, a NodeID + Subnet does uniquely map to a BLS key
+	Signer signer.Signer `serialize:"true" json:"signer"`
+	// Leftover $AVAX from the [Balance] will be issued to this owner once it is
+	// removed from the validator set.
+	RemainingBalanceOwner fx.Owner `serialize:"true" json:"remainingBalanceOwner"`
+}
+
+func (v ConvertSubnetValidator) Compare(o ConvertSubnetValidator) int {
+	return v.NodeID.Compare(o.NodeID)
+}
+
+func (v *ConvertSubnetValidator) Verify() error {
+	if v.Weight == 0 {
+		return ErrZeroWeight
+	}
+	if err := verify.All(v.Signer, v.RemainingBalanceOwner); err != nil {
+		return err
+	}
+	if v.Signer.Key() == nil {
+		return ErrMissingPublicKey
+	}
+	return nil
+}