Merge pull request #99 from mycel-domain/feat/withdraw-sld-fee

Withdraw SLD Registration Fees

docs/static/openapi.yml

@@ -50393,6 +50393,24 @@ paths:
                           - OWNER
                           - EDITOR
                         default: NO_ROLE
+                    registrationFees:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          denom:
+                            type: string
+                          amount:
+                            type: string
+                        description: >-
+                          Coin defines a token with a denomination and an
+                          amount.
+
+
+                          NOTE: The amount field is an Int which implements the
+                          custom method
+
+                          signatures required by gogoproto.
               pagination:
                 type: object
                 properties:
@@ -50603,6 +50621,23 @@ paths:
                         - OWNER
                         - EDITOR
                       default: NO_ROLE
+                  registrationFees:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        denom:
+                          type: string
+                        amount:
+                          type: string
+                      description: >-
+                        Coin defines a token with a denomination and an amount.
+
+
+                        NOTE: The amount field is an Int which implements the
+                        custom method
+
+                        signatures required by gogoproto.
         default:
           description: An unexpected error response.
           schema:
@@ -81143,14 +81178,31 @@ definitions:
 
           NOTE: The amount field is an Int which implements the custom method
           signatures required by gogoproto.
-  mycel.registry.MsgRegisterDomainResponse:
+  mycel.registry.MsgRegisterSecondLevelDomainResponse:
     type: object
   mycel.registry.MsgRegisterTopLevelDomainResponse:
     type: object
   mycel.registry.MsgUpdateDnsRecordResponse:
     type: object
   mycel.registry.MsgUpdateWalletRecordResponse:
     type: object
+  mycel.registry.MsgWithdrawRegistrationFeeResponse:
+    type: object
+    properties:
+      registrationFees:
+        type: array
+        items:
+          type: object
+          properties:
+            denom:
+              type: string
+            amount:
+              type: string
+          description: |-
+            Coin defines a token with a denomination and an amount.
+
+            NOTE: The amount field is an Int which implements the custom method
+            signatures required by gogoproto.
   mycel.registry.OwnedDomain:
     type: object
     properties:
@@ -81346,6 +81398,23 @@ definitions:
                   - OWNER
                   - EDITOR
                 default: NO_ROLE
+            registrationFees:
+              type: array
+              items:
+                type: object
+                properties:
+                  denom:
+                    type: string
+                  amount:
+                    type: string
+                description: >-
+                  Coin defines a token with a denomination and an amount.
+
+
+                  NOTE: The amount field is an Int which implements the custom
+                  method
+
+                  signatures required by gogoproto.
       pagination:
         type: object
         properties:
@@ -81514,6 +81583,23 @@ definitions:
                 - OWNER
                 - EDITOR
               default: NO_ROLE
+          registrationFees:
+            type: array
+            items:
+              type: object
+              properties:
+                denom:
+                  type: string
+                amount:
+                  type: string
+              description: >-
+                Coin defines a token with a denomination and an amount.
+
+
+                NOTE: The amount field is an Int which implements the custom
+                method
+
+                signatures required by gogoproto.
   mycel.registry.QueryIsRegistrableDomainResponse:
     type: object
     properties:
@@ -81757,6 +81843,20 @@ definitions:
             - OWNER
             - EDITOR
           default: NO_ROLE
+      registrationFees:
+        type: array
+        items:
+          type: object
+          properties:
+            denom:
+              type: string
+            amount:
+              type: string
+          description: |-
+            Coin defines a token with a denomination and an amount.
+
+            NOTE: The amount field is an Int which implements the custom method
+            signatures required by gogoproto.
   mycel.registry.DnsRecord:
     type: object
     properties:

proto/mycel/registry/top_level_domain.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 package mycel.registry;
 
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
 import "mycel/registry/subdomain_config.proto";
 import "mycel/registry/role.proto";
 
@@ -13,4 +15,8 @@ message TopLevelDomain {
   SubdomainConfig subdomainConfig = 4;
   uint64 subdomainCount = 5;
   map<string, DomainRole> accessControl = 6;
+  repeated cosmos.base.v1beta1.Coin registrationFee = 7 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
 }

proto/mycel/registry/tx.proto

@@ -2,14 +2,18 @@ syntax = "proto3";
 
 package mycel.registry;
 
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+
 option go_package = "github.com/mycel-domain/mycel/x/registry/types";
 
 // Msg defines the Msg service.
 service Msg {
-  rpc UpdateWalletRecord     (MsgUpdateWalletRecord    ) returns (MsgUpdateWalletRecordResponse    );
-  rpc UpdateDnsRecord        (MsgUpdateDnsRecord       ) returns (MsgUpdateDnsRecordResponse       );
-  rpc RegisterDomain         (MsgRegisterDomain        ) returns (MsgRegisterDomainResponse        );
-  rpc RegisterTopLevelDomain (MsgRegisterTopLevelDomain) returns (MsgRegisterTopLevelDomainResponse);
+  rpc UpdateWalletRecord      (MsgUpdateWalletRecord     ) returns (MsgUpdateWalletRecordResponse     );
+  rpc UpdateDnsRecord         (MsgUpdateDnsRecord        ) returns (MsgUpdateDnsRecordResponse        );
+  rpc RegisterSecondLevelDomain          (MsgRegisterSecondLevelDomain         ) returns (MsgRegisterSecondLevelDomainResponse         );
+  rpc RegisterTopLevelDomain  (MsgRegisterTopLevelDomain ) returns (MsgRegisterTopLevelDomainResponse );
+  rpc WithdrawRegistrationFee (MsgWithdrawRegistrationFee) returns (MsgWithdrawRegistrationFeeResponse);
 }
 message MsgUpdateWalletRecord {
   string creator          = 1;
@@ -31,14 +35,14 @@ message MsgUpdateDnsRecord {
 
 message MsgUpdateDnsRecordResponse {}
 
-message MsgRegisterDomain {
+message MsgRegisterSecondLevelDomain {
   string creator                  = 1;
   string name                     = 2;
   string parent                   = 3;
   uint64 registrationPeriodInYear = 4;
 }
 
-message MsgRegisterDomainResponse {}
+message MsgRegisterSecondLevelDomainResponse {}
 
 message MsgRegisterTopLevelDomain {
   string creator                  = 1;
@@ -47,3 +51,16 @@ message MsgRegisterTopLevelDomain {
 }
 
 message MsgRegisterTopLevelDomainResponse {}
+
+message MsgWithdrawRegistrationFee {
+  string creator = 1;
+  string name    = 2;
+}
+
+message MsgWithdrawRegistrationFeeResponse {
+  repeated cosmos.base.v1beta1.Coin registrationFee = 7 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+}
+

x/registry/client/cli/tx.go

@@ -34,6 +34,7 @@ func GetTxCmd() *cobra.Command {
 	cmd.AddCommand(CmdUpdateDnsRecord())
 	cmd.AddCommand(CmdRegisterDomain())
 	cmd.AddCommand(CmdRegisterTopLevelDomain())
+	cmd.AddCommand(CmdWithdrawRegistrationFee())
 	// this line is used by starport scaffolding # 1
 
 	return cmd

x/registry/client/cli/tx_register_second_level_domain.go

@@ -31,7 +31,7 @@ func CmdRegisterDomain() *cobra.Command {
 				return err
 			}
 
-			msg := types.NewMsgRegisterDomain(
+			msg := types.NewMsgRegisterSecondLevelDomain(
 				clientCtx.GetFromAddress().String(),
 				argName,
 				argParent,

x/registry/client/cli/tx_withdraw_registration_fee.go

@@ -0,0 +1,42 @@
+package cli
+
+import (
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/mycel-domain/mycel/x/registry/types"
+	"github.com/spf13/cobra"
+)
+
+var _ = strconv.Itoa(0)
+
+func CmdWithdrawRegistrationFee() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "withdraw-registration-fee [name]",
+		Short: "Broadcast message withdrawRegistrationFee",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			argName := args[0]
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgWithdrawRegistrationFee(
+				clientCtx.GetFromAddress().String(),
+				argName,
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}

x/registry/keeper/msg_server_register_second_level_domain.go

@@ -11,7 +11,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func (k msgServer) RegisterDomain(goCtx context.Context, msg *types.MsgRegisterDomain) (*types.MsgRegisterDomainResponse, error) {
+func (k msgServer) RegisterSecondLevelDomain(goCtx context.Context, msg *types.MsgRegisterSecondLevelDomain) (*types.MsgRegisterSecondLevelDomainResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if msg.RegistrationPeriodInYear < 1 || msg.RegistrationPeriodInYear > 4 {
@@ -38,10 +38,10 @@ func (k msgServer) RegisterDomain(goCtx context.Context, msg *types.MsgRegisterD
 		AccessControl:  accessControl,
 	}
 
-	err = k.Keeper.RegisterDomain(ctx, domain, creatorAddress, msg.RegistrationPeriodInYear)
+	err = k.Keeper.RegisterSecondLevelDomain(ctx, domain, creatorAddress, msg.RegistrationPeriodInYear)
 	if err != nil {
 		return nil, err
 	}
 
-	return &types.MsgRegisterDomainResponse{}, nil
+	return &types.MsgRegisterSecondLevelDomainResponse{}, nil
 }