feat: add inactive contract management in wasm

client/docs/swagger-ui/swagger.yaml

@@ -44157,6 +44157,54 @@ paths:
           format: boolean
       tags:
         - Query
+  '/lbm/wasm/v1/inactive_contracts/{address}':
+    get:
+      operationId: InactiveContract
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              inactivated:
+                type: boolean
+                format: boolean
+                title: >-
+                  inactivated is the result if the contract is inactive contract
+                  or not
+            title: >-
+              QueryInactiveContractsResponse is the response type for the
+              Query/IsInactiveContract RPC method
+        default:
+          description: An unexpected error response
+          schema:
+            type: object
+            properties:
+              error:
+                type: string
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    type_url:
+                      type: string
+                    value:
+                      type: string
+                      format: byte
+      parameters:
+        - name: address
+          description: address is the address of the contract
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
 securityDefinitions:
   kms:
     type: basic
@@ -70472,6 +70520,16 @@ definitions:
     description: >-
       QueryAllowancesResponse is the response type for the Query/Allowances RPC
       method.
+  lbm.wasm.v1.QueryInactiveContractResponse:
+    type: object
+    properties:
+      inactivated:
+        type: boolean
+        format: boolean
+        title: inactivated is the result if the contract is inactive contract or not
+    title: >-
+      QueryInactiveContractsResponse is the response type for the
+      Query/IsInactiveContract RPC method
   lbm.wasm.v1.QueryInactiveContractsResponse:
     type: object
     properties:

docs/core/proto-docs.md

@@ -1234,6 +1234,8 @@
     - [DeactivateContractProposal](#lbm.wasm.v1.DeactivateContractProposal)
 
 - [lbm/wasm/v1/query.proto](#lbm/wasm/v1/query.proto)
+    - [QueryInactiveContractRequest](#lbm.wasm.v1.QueryInactiveContractRequest)
+    - [QueryInactiveContractResponse](#lbm.wasm.v1.QueryInactiveContractResponse)
     - [QueryInactiveContractsRequest](#lbm.wasm.v1.QueryInactiveContractsRequest)
     - [QueryInactiveContractsResponse](#lbm.wasm.v1.QueryInactiveContractsResponse)
 
@@ -18537,7 +18539,7 @@ EventActivateContractProposal is the event that is emitted when the contract is
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `contractAddress` | [string](#string) |  | contractAddress is the smart contract's address |
+| `contract` | [string](#string) |  | contract is the smart contract's address |
 
 
 
@@ -18552,7 +18554,7 @@ EventDeactivateContractProposal is the event that is emitted when the contract i
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `contractAddress` | [string](#string) |  | contractAddress is the smart contract's address |
+| `contract` | [string](#string) |  | contract is the smart contract's address |
 
 
 
@@ -18625,6 +18627,36 @@ DeactivateContractProposal gov proposal content type adds a contract to inactive
 
 
 
+<a name="lbm.wasm.v1.QueryInactiveContractRequest"></a>
+
+### QueryInactiveContractRequest
+QueryIsInactiveContractRequest is the request type for Query/IsInactiveContract RPC method
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `address` | [string](#string) |  | address is the address of the contract |
+
+
+
+
+
+
+<a name="lbm.wasm.v1.QueryInactiveContractResponse"></a>
+
+### QueryInactiveContractResponse
+QueryInactiveContractsResponse is the response type for the Query/IsInactiveContract RPC method
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `inactivated` | [bool](#bool) |  | inactivated is the result if the contract is inactive contract or not |
+
+
+
+
+
+
 <a name="lbm.wasm.v1.QueryInactiveContractsRequest"></a>
 
 ### QueryInactiveContractsRequest
@@ -18670,6 +18702,7 @@ Query defines the gRPC querier service.
 | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
 | ----------- | ------------ | ------------- | ------------| ------- | -------- |
 | `InactiveContracts` | [QueryInactiveContractsRequest](#lbm.wasm.v1.QueryInactiveContractsRequest) | [QueryInactiveContractsResponse](#lbm.wasm.v1.QueryInactiveContractsResponse) | InactiveContracts queries all inactive contracts. | GET|/lbm/wasm/v1/inactive_contracts|
+| `InactiveContract` | [QueryInactiveContractRequest](#lbm.wasm.v1.QueryInactiveContractRequest) | [QueryInactiveContractResponse](#lbm.wasm.v1.QueryInactiveContractResponse) |  | GET|/lbm/wasm/v1/inactive_contracts/{address}|
 
  <!-- end services -->
 

proto/cosmwasm/wasm/v1/types.proto

@@ -42,7 +42,7 @@ message Params {
   AccessConfig code_upload_access     = 1
       [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"code_upload_access\""];
   AccessType instantiate_default_permission = 2 [(gogoproto.moretags) = "yaml:\"instantiate_default_permission\""];
-  uint64     gas_multiplier                 = 3 [(gogoproto.moretags) = "yaml:\"max_gas\""];
+  uint64     gas_multiplier                 = 3 [(gogoproto.moretags) = "yaml:\"gas_multiplier\""];
   uint64     instance_cost                  = 4 [(gogoproto.moretags) = "yaml:\"instance_cost\""];
   uint64     compile_cost                   = 5 [(gogoproto.moretags) = "yaml:\"compile_cost\""];
 }

proto/lbm/wasm/v1/event.proto

@@ -5,12 +5,12 @@ option go_package = "github.com/line/lbm-sdk/x/wasm/lbmtypes";
 
 // EventDeactivateContractProposal is the event that is emitted when the contract is deactivate
 message EventDeactivateContractProposal {
-  // contractAddress is the smart contract's address
-  string contractAddress = 1;
+  // contract is the smart contract's address
+  string contract = 1;
 }
 
 // EventActivateContractProposal is the event that is emitted when the contract is activates.
 message EventActivateContractProposal {
-  // contractAddress is the smart contract's address
-  string contractAddress = 1;
+  // contract is the smart contract's address
+  string contract = 1;
 }

proto/lbm/wasm/v1/query.proto

@@ -15,6 +15,10 @@ service Query {
   rpc InactiveContracts(QueryInactiveContractsRequest) returns (QueryInactiveContractsResponse) {
     option (google.api.http).get = "/lbm/wasm/v1/inactive_contracts";
   };
+
+  rpc InactiveContract(QueryInactiveContractRequest) returns (QueryInactiveContractResponse) {
+    option (google.api.http).get = "/lbm/wasm/v1/inactive_contracts/{address}";
+  }
 }
 
 // QueryInactiveContractsRequest is the request type for Query/InactiveContract RPC method
@@ -31,3 +35,15 @@ message QueryInactiveContractsResponse {
   // pagination defines the pagination in the response.
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
+
+// QueryIsInactiveContractRequest is the request type for Query/IsInactiveContract RPC method
+message QueryInactiveContractRequest {
+  // address is the address of the contract
+  string address = 1;
+}
+
+// QueryInactiveContractsResponse is the response type for the Query/IsInactiveContract RPC method
+message QueryInactiveContractResponse {
+  // inactivated is the result if the contract is inactive contract or not
+  bool inactivated = 1;
+}

x/wasm/client/cli/query.go

@@ -39,7 +39,8 @@ func GetQueryCmd() *cobra.Command {
 		GetCmdGetContractState(),
 		GetCmdListPinnedCode(),
 		GetCmdLibVersion(),
-		GetCmdListInactiveContract(),
+		GetCmdListInactiveContracts(),
+		GetCmdIsInactiveContract(),
 	)
 	return queryCmd
 }
@@ -540,9 +541,9 @@ func withPageKeyDecoded(flagSet *flag.FlagSet) *flag.FlagSet {
 	return flagSet
 }
 
-func GetCmdListInactiveContract() *cobra.Command {
+func GetCmdListInactiveContracts() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:  "inactive-contract",
+		Use:  "inactive-contracts",
 		Long: "List all inactive contracts",
 		Args: cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -572,3 +573,31 @@ func GetCmdListInactiveContract() *cobra.Command {
 	flags.AddPaginationFlagsToCmd(cmd, "list of inactive contracts")
 	return cmd
 }
+
+func GetCmdIsInactiveContract() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:  "is-inactive [bech32_address]",
+		Long: "check if inactive contract or not",
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := lbmtypes.NewQueryClient(clientCtx)
+			res, err := queryClient.InactiveContract(
+				context.Background(),
+				&lbmtypes.QueryInactiveContractRequest{
+					Address: args[0],
+				},
+			)
+			if err != nil {
+				return err
+			}
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}

x/wasm/client/rest/query.go

@@ -29,6 +29,7 @@ func registerQueryRoutes(cliCtx client.Context, r *mux.Router) {
 	r.HandleFunc("/wasm/contract/{contractAddr}/smart/{query}", queryContractStateSmartHandlerFn(cliCtx)).Queries("encoding", "{encoding}").Methods("GET")
 	r.HandleFunc("/wasm/contract/{contractAddr}/raw/{key}", queryContractStateRawHandlerFn(cliCtx)).Queries("encoding", "{encoding}").Methods("GET")
 	r.HandleFunc("/wasm/inactive_contract", listInactiveContractsHandlerFn(cliCtx)).Queries("GET")
+	r.HandleFunc("/wasm/inactive_contract/{contractAddr}", queryInactiveContractHandlerFn(cliCtx)).Queries("GET")
 }
 
 func listCodesHandlerFn(cliCtx client.Context) http.HandlerFunc {
@@ -424,3 +425,34 @@ func listInactiveContractsHandlerFn(cliCtx client.Context) http.HandlerFunc {
 		rest.PostProcessResponse(w, cliCtx, json.RawMessage(res))
 	}
 }
+
+func queryInactiveContractHandlerFn(cliCtx client.Context) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, keeper.QueryIsInactiveContract)
+		addr, err := sdk.AccAddressFromBech32(mux.Vars(r)["contractAddr"])
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		data := lbmtypes.QueryInactiveContractRequest{Address: addr.String()}
+		bs, err := cliCtx.LegacyAmino.MarshalJSON(data)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		res, height, err := cliCtx.QueryWithData(route, bs)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		cliCtx = cliCtx.WithHeight(height)
+		rest.PostProcessResponse(w, cliCtx, json.RawMessage(res))
+	}
+}

x/wasm/client/testutil/query.go

@@ -467,10 +467,10 @@ func (s *IntegrationTestSuite) TestGetCmdListPinnedCode() {
 	s.Require().Equal(expcted, &contractInfo)
 }
 
-func (s *IntegrationTestSuite) TestGetCmdListInactiveContract() {
+func (s *IntegrationTestSuite) TestGetCmdListInactiveContracts() {
 	val := s.network.Validators[0]
 
-	cmd := cli.GetCmdListInactiveContract()
+	cmd := cli.GetCmdListInactiveContracts()
 	out, err := clitestutil.ExecTestCLICmd(val.ClientCtx, cmd, s.queryCommonArgs())
 	s.Require().NoError(err)
 
@@ -482,3 +482,57 @@ func (s *IntegrationTestSuite) TestGetCmdListInactiveContract() {
 	s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &resInfo), out.String())
 	s.Require().Equal(expected, &resInfo)
 }
+
+func (s *IntegrationTestSuite) TestGetCmdIsInactiveContract() {
+	val := s.network.Validators[0]
+
+	testCases := map[string]struct {
+		args     []string
+		valid    bool
+		expected proto.Message
+	}{
+		"valid query(inactivate)": {
+			[]string{
+				s.inactiveContractAddress,
+			},
+			true,
+			&lbmtypes.QueryInactiveContractResponse{
+				Inactivated: true,
+			},
+		},
+		"valid query(activate)": {
+			[]string{
+				"link1hmayw7vv0p3gzeh3jzwmw9xj8fy8a3kmpqgjrysljdnecqkps02qrq5rvm",
+			},
+			true,
+			&lbmtypes.QueryInactiveContractResponse{
+				Inactivated: false,
+			},
+		},
+		"wrong bech32_address": {
+			[]string{
+				"xxx",
+			},
+			false,
+			nil,
+		},
+	}
+
+	for name, tc := range testCases {
+		tc := tc
+
+		s.Run(name, func() {
+			cmd := cli.GetCmdIsInactiveContract()
+			out, err := clitestutil.ExecTestCLICmd(val.ClientCtx, cmd, append(tc.args, s.queryCommonArgs()...))
+			if !tc.valid {
+				s.Require().Error(err)
+				return
+			}
+			s.Require().NoError(err)
+
+			var resInfo lbmtypes.QueryInactiveContractResponse
+			s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &resInfo), out.String())
+			s.Require().Equal(tc.expected, &resInfo)
+		})
+	}
+}

x/wasm/keeper/keeper_extension.go

@@ -43,9 +43,6 @@ func (k Keeper) activateContract(ctx sdk.Context, contractAddress sdk.AccAddress
 	if !k.IsInactiveContract(ctx, contractAddress) {
 		return sdkerrors.Wrapf(wasmtypes.ErrNotFound, "no inactivate contract %s", contractAddress.String())
 	}
-	if !k.HasContractInfo(ctx, contractAddress) {
-		return sdkerrors.Wrapf(wasmtypes.ErrInvalid, "no contract %s", contractAddress)
-	}
 
 	k.deleteInactiveContract(ctx, contractAddress)
 	k.bank.DeleteFromInactiveAddr(ctx, contractAddress)