refactor register validator

Author: sukantoraymond

cmd/blockchaincmd/add_validator.go

@@ -652,32 +652,64 @@ func CallAddValidator(
 	ctx, cancel := sdkutils.GetTimedContext(constants.EVMEventLookupTimeout)
 	defer cancel()
 
+	subnetID, err := contract.GetSubnetID(
+		app,
+		network,
+		contract.ChainSpec{
+			BlockchainID: validatorManagerBlockchainID.String(),
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	validatorManagerParams := validatormanager.ValidatorManagerParams{
+		RpcURL:            validatorManagerRPCEndpoint,
+		Signer:            signer,
+		NodeID:            nodeID,
+		BlsPublicKey:      blsInfo.PublicKey[:],
+		BalanceOwners:     remainingBalanceOwners,
+		DisableOwners:     disableOwners,
+		ManagerAddressStr: validatorManagerAddress,
+		Weight:            weight,
+	}
+
+	getRegisterValidatorSignedMessageParams := validatormanager.GetRegisterValidatorSignedMessageParams{
+		Network:      network,
+		Expiry:       expiry,
+		SubnetID:     subnetID,
+		BlockchainID: validatorManagerBlockchainID,
+		SigAggParams: validatormanager.SignatureAggregatorParams{
+			AggregatorLogger:            aggregatorLogger,
+			SignatureAggregatorEndpoint: signatureAggregatorEndpoint,
+			PchainHeight:                pChainEpoch.PChainHeight,
+		},
+	}
+
+	initValidatorRegistrationParams := validatormanager.InitValidatorRegistrationParams{
+		ValidatorManager:    validatorManagerParams,
+		SignedMessageParams: getRegisterValidatorSignedMessageParams,
+		TxHash:              initiateTxHash,
+	}
+	if pos {
+		posParams := validatormanager.ProofOfStakeParams{
+			delegationFee,
+			duration,
+			common.HexToAddress(rewardsRecipientAddr),
+		}
+		initValidatorRegistrationParams.PoS = &posParams
+	}
+	initValidatorRegistrationOpts := validatormanager.InitValidatorRegistrationOptions{
+		// Execution behavior (don’t broadcast; return unsigned init tx)
+		BuildOnly: externalValidatorManagerOwner,
+		Logger:    duallogger.NewDualLogger(true, app),
+	}
+
 	// Example of using the HybridLogger with SDK functions
 	signedMessage, validationID, rawTx, err := validatormanager.InitValidatorRegistration(
 		ctx,
-		duallogger.NewDualLogger(true, app),
-		app,
-		network,
-		validatorManagerRPCEndpoint,
-		chainSpec,
-		externalValidatorManagerOwner,
-		signer,
-		nodeID,
-		blsInfo.PublicKey[:],
-		expiry,
-		remainingBalanceOwners,
-		disableOwners,
-		weight,
-		aggregatorLogger,
-		pos,
-		delegationFee,
-		duration,
-		common.HexToAddress(rewardsRecipientAddr),
-		validatorManagerBlockchainID,
-		validatorManagerAddress,
-		initiateTxHash,
-		signatureAggregatorEndpoint,
-		pChainEpoch.PChainHeight,
+		initValidatorRegistrationParams,
+		initValidatorRegistrationOpts,
 	)
 	if err != nil {
 		return err

cmd/nodecmd/local.go

@@ -665,31 +665,61 @@ func addAsValidator(
 	if err != nil {
 		return fmt.Errorf("failure parsing blockchain ID: %w", err)
 	}
-	signedMessage, validationID, _, err := validatormanager.InitValidatorRegistration(
-		ctx,
-		duallogger.NewDualLogger(true, app),
+
+	subnetID, err := contract.GetSubnetID(
 		app,
 		network,
-		localValidateFlags.RPC,
-		chainSpec,
-		false,
-		signer,
-		nodeID,
-		blsInfo.PublicKey[:],
-		expiry,
-		remainingBalanceOwners,
-		disableOwners,
-		0,
-		aggregatorLogger,
-		true,
+		contract.ChainSpec{
+			BlockchainID: l1BlockchainID.String(),
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	validatorManagerParams := validatormanager.ValidatorManagerParams{
+		RpcURL:            localValidateFlags.RPC,
+		Signer:            signer,
+		NodeID:            nodeID,
+		BlsPublicKey:      blsInfo.PublicKey[:],
+		BalanceOwners:     remainingBalanceOwners,
+		DisableOwners:     disableOwners,
+		ManagerAddressStr: validatorManagerAddress,
+		Weight:            weight,
+	}
+
+	getRegisterValidatorSignedMessageParams := validatormanager.GetRegisterValidatorSignedMessageParams{
+		Network:      network,
+		Expiry:       expiry,
+		SubnetID:     subnetID,
+		BlockchainID: l1BlockchainID,
+		SigAggParams: validatormanager.SignatureAggregatorParams{
+			AggregatorLogger:            aggregatorLogger,
+			SignatureAggregatorEndpoint: signatureAggregatorEndpoint,
+			PchainHeight:                pChainEpoch.PChainHeight,
+		},
+	}
+
+	initValidatorRegistrationParams := validatormanager.InitValidatorRegistrationParams{
+		ValidatorManager:    validatorManagerParams,
+		SignedMessageParams: getRegisterValidatorSignedMessageParams,
+	}
+	posParams := validatormanager.ProofOfStakeParams{
 		delegationFee,
-		time.Duration(minimumStakeDuration)*time.Second,
+		time.Duration(minimumStakeDuration) * time.Second,
 		common.HexToAddress(rewardsRecipientAddr),
-		l1BlockchainID,
-		validatorManagerAddress,
-		"",
-		signatureAggregatorEndpoint,
-		pChainEpoch.PChainHeight,
+	}
+	initValidatorRegistrationParams.PoS = &posParams
+	initValidatorRegistrationOpts := validatormanager.InitValidatorRegistrationOptions{
+		// Execution behavior (don’t broadcast; return unsigned init tx)
+		BuildOnly: false,
+		Logger:    duallogger.NewDualLogger(true, app),
+	}
+
+	signedMessage, validationID, _, err := validatormanager.InitValidatorRegistration(
+		ctx,
+		initValidatorRegistrationParams,
+		initValidatorRegistrationOpts,
 	)
 	if err != nil {
 		return err