Make execute optional

Author: webmaster128

CHANGELOG.md

@@ -70,8 +70,8 @@ and this project adheres to
 - all: Rename `init` entry point to `instantiate`.
 - all: Rename `system` entry point to `sudo`.
 - all: Drop support for Rust versions lower than 1.50.0.
-- all: The `query` enpoint is now optional. It is still highly recommended to
-  expose it an almost any use case though.
+- all: The `query` and `execute` entry points are now optional. It is still
+  highly recommended to implement and expose them in almost any use case though.
 - all: Change the encoding of the key/value region of the `db_next` import to a
   more generic encoding that supports an arbitrary number of sections. This
   encoding can then be reused for other multi value regions.

contracts/burner/src/contract.rs

@@ -2,7 +2,7 @@ use cosmwasm_std::{
     attr, entry_point, BankMsg, DepsMut, Env, MessageInfo, Order, Response, StdError, StdResult,
 };
 
-use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg};
+use crate::msg::{InstantiateMsg, MigrateMsg};
 
 #[entry_point]
 pub fn instantiate(
@@ -16,18 +16,6 @@ pub fn instantiate(
     ))
 }
 
-#[entry_point]
-pub fn execute(
-    _deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    _msg: ExecuteMsg,
-) -> StdResult<Response> {
-    Err(StdError::generic_err(
-        "You can only use this contract for migrations",
-    ))
-}
-
 #[entry_point]
 pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> StdResult<Response> {
     // delete all state

contracts/burner/src/msg.rs

@@ -13,7 +13,3 @@ pub struct MigrateMsg {
 /// A placeholder where we don't take any input
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct InstantiateMsg {}
-
-/// ExecuteMsg is a placeholder where we don't take any input
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct ExecuteMsg {}

contracts/crypto-verify/src/contract.rs

@@ -10,8 +10,7 @@ use crate::ethereum::{
     decode_address, ethereum_address_raw, get_recovery_param, verify_transaction,
 };
 use crate::msg::{
-    list_verifications, ExecuteMsg, InstantiateMsg, ListVerificationsResponse, QueryMsg,
-    VerifyResponse,
+    list_verifications, InstantiateMsg, ListVerificationsResponse, QueryMsg, VerifyResponse,
 };
 
 pub const VERSION: &str = "crypto-verify-v2";
@@ -26,16 +25,6 @@ pub fn instantiate(
     Ok(Response::default())
 }
 
-#[entry_point]
-pub fn execute(
-    _deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    _msg: ExecuteMsg,
-) -> StdResult<Response> {
-    Ok(Response::default())
-}
-
 #[entry_point]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
     match msg {

contracts/crypto-verify/src/msg.rs

@@ -7,10 +7,6 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct InstantiateMsg {}
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ExecuteMsg {}
-
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {

packages/vm/src/compatibility.rs

@@ -28,12 +28,11 @@ const SUPPORTED_IMPORTS: &[&str] = &[
 ];
 
 /// Lists all entry points we expect to be present when calling a contract.
-/// Other optional exports exist, e.g. "query" and "migrate".
+/// Other optional exports exist, e.g. "execute", "migrate" and "query".
 /// This is unlikely to change much, must be frozen at 1.0 to avoid breaking existing contracts
 const REQUIRED_EXPORTS: &[&str] = &[
     "interface_version_5",
     "instantiate",
-    "execute",
     "allocate",
     "deallocate",
 ];

packages/vm/src/instance.rs

@@ -527,7 +527,6 @@ mod tests {
                 (func (type 0) nop)
                 (export "interface_version_5" (func 0))
                 (export "instantiate" (func 0))
-                (export "execute" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
             )"#,
@@ -546,7 +545,6 @@ mod tests {
                 (func (type 0) nop)
                 (export "interface_version_5" (func 0))
                 (export "instantiate" (func 0))
-                (export "execute" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
             )"#,

packages/vm/src/static_analysis.rs

@@ -73,7 +73,7 @@ mod tests {
                         false
                     }
                 });
-        assert_eq!(exported_functions.count(), 8); // 6 required export plus "migrate" and "sudo"
+        assert_eq!(exported_functions.count(), 8); // 4 required exports plus "execute", "migrate", "query" and "sudo"
 
         let exported_memories = module
             .export_section()
@@ -139,7 +139,6 @@ mod tests {
                 (func (type 0) nop)
                 (export "interface_version_5" (func 0))
                 (export "instantiate" (func 0))
-                (export "execute" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
             )"#,