Remove deploy megapool as it is done automatically on first deposit

Author: 0xfornax

bindings/node/node.go

@@ -706,28 +706,6 @@ func ConfirmRPLWithdrawalAddress(rp *rocketpool.RocketPool, nodeAddress common.A
 	return tx.Hash(), nil
 }
 
-func EstimateDeployMegapool(rp *rocketpool.RocketPool, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
-	rocketNodeManager, err := getRocketNodeManager(rp, nil)
-	if err != nil {
-		return rocketpool.GasInfo{}, err
-	}
-	return rocketNodeManager.GetTransactionGasInfo(opts, "deployMegapool")
-}
-
-// Deploys a Megapool contract
-func DeployMegapool(rp *rocketpool.RocketPool, opts *bind.TransactOpts) (common.Hash, error) {
-	rocketNodeManager, err := getRocketNodeManager(rp, nil)
-	if err != nil {
-		return common.Hash{}, nil
-	}
-
-	tx, err := rocketNodeManager.Transact(opts, "deployMegapool")
-	if err != nil {
-		return common.Hash{}, fmt.Errorf("error calling deployMegapool: %w", err)
-	}
-	return tx.Hash(), nil
-}
-
 // Get express ticket count for a node
 func GetExpressTicketCount(rp *rocketpool.RocketPool, nodeAddress common.Address, opts *bind.CallOpts) (uint64, error) {
 	rocketMegapoolFactory, err := getRocketNodeManager(rp, opts)

rocketpool-cli/megapool/commands.go

@@ -13,20 +13,6 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 		Aliases: aliases,
 		Usage:   "Manage the node's megapool",
 		Subcommands: []cli.Command{
-			{
-				Name:      "deploy",
-				Usage:     "Deploy a megapool contract for your node",
-				UsageText: "rocketpool node deploy",
-				Flags: []cli.Flag{
-					cli.BoolFlag{
-						Name:  "yes, y",
-						Usage: "Automatically confirm deployment",
-					},
-				},
-				Action: func(c *cli.Context) error {
-					return deployMegapool(c)
-				},
-			},
 			{
 				Name:      "deposit",
 				Aliases:   []string{"d"},

rocketpool/api/megapool/commands.go

@@ -14,41 +14,6 @@ func RegisterSubcommands(command *cli.Command, name string, aliases []string) {
 		Aliases: aliases,
 		Usage:   "Manage the node's megapool",
 		Subcommands: []cli.Command{
-			{
-				Name:      "can-deploy-megapool",
-				Usage:     "Check if the node can deploy a megapool",
-				UsageText: "rocketpool api node can-deploy-megapool",
-				Action: func(c *cli.Context) error {
-
-					// Validate args
-					if err := cliutils.ValidateArgCount(c, 0); err != nil {
-						return err
-					}
-
-					// Run
-					api.PrintResponse(canDeployMegapool(c))
-					return nil
-
-				},
-			},
-
-			{
-				Name:      "deploy-megapool",
-				Usage:     "Deploy the node's megapool",
-				UsageText: "rocketpool api node deploy-megapool",
-				Action: func(c *cli.Context) error {
-
-					// Validate args
-					if err := cliutils.ValidateArgCount(c, 0); err != nil {
-						return err
-					}
-
-					// Run
-					api.PrintResponse(deployMegapool(c))
-					return nil
-
-				},
-			},
 			{
 				Name:      "can-distribute-megapool",
 				Usage:     "Check if can distribute megapool rewards",

rocketpool/api/megapool/deploy-megapool.go

@@ -1241,38 +1241,6 @@ func (c *Client) SendMessage(address common.Address, message []byte) (api.NodeSe
 	return response, nil
 }
 
-// Check if the node can deploy a megapool
-func (c *Client) CanDeployMegapool() (api.CanDeployMegapoolResponse, error) {
-	responseBytes, err := c.callAPI("megapool can-deploy-megapool")
-	if err != nil {
-		return api.CanDeployMegapoolResponse{}, fmt.Errorf("Could not get can-deploy-megapool response: %w", err)
-	}
-	var response api.CanDeployMegapoolResponse
-	if err := json.Unmarshal(responseBytes, &response); err != nil {
-		return api.CanDeployMegapoolResponse{}, fmt.Errorf("Could not decode can-deploy-megapool response: %w", err)
-	}
-	if response.Error != "" {
-		return api.CanDeployMegapoolResponse{}, fmt.Errorf("Could not get can-deploy-megapool response: %s", response.Error)
-	}
-	return response, nil
-}
-
-// Deploy a megapool
-func (c *Client) DeployMegapool() (api.DeployMegapoolResponse, error) {
-	responseBytes, err := c.callAPI("megapool deploy-megapool")
-	if err != nil {
-		return api.DeployMegapoolResponse{}, fmt.Errorf("Could not get deploy-megapool response: %w", err)
-	}
-	var response api.DeployMegapoolResponse
-	if err := json.Unmarshal(responseBytes, &response); err != nil {
-		return api.DeployMegapoolResponse{}, fmt.Errorf("Could not decode deploy-megapool response: %w", err)
-	}
-	if response.Error != "" {
-		return api.DeployMegapoolResponse{}, fmt.Errorf("Could not get deploy-megapool response: %s", response.Error)
-	}
-	return response, nil
-}
-
 // Get the number of express tickets available for the node
 func (c *Client) GetExpressTicketCount() (api.GetExpressTicketCountResponse, error) {
 	responseBytes, err := c.callAPI("node get-express-ticket-count")

shared/services/rocketpool/node.go

@@ -762,20 +762,6 @@ type NodeAlertsResponse struct {
 	// TODO: change to GettableAlerts
 	Message string `json:"message"`
 }
-type CanDeployMegapoolResponse struct {
-	Status          string             `json:"status"`
-	Error           string             `json:"error"`
-	CanDeploy       bool               `json:"canDeploy"`
-	AlreadyDeployed bool               `json:"alreadyDeployed"`
-	ExpectedAddress common.Address     `json:"expectedAddress"`
-	GasInfo         rocketpool.GasInfo `json:"gasInfo"`
-}
-
-type DeployMegapoolResponse struct {
-	Status string      `json:"status"`
-	Error  string      `json:"error"`
-	TxHash common.Hash `json:"txHash"`
-}
 
 type GetExpressTicketCountResponse struct {
 	Status string `json:"status"`