Add #[entry_point] macro attribute to generate entry points

contracts/burner/src/contract.rs

@@ -1,6 +1,6 @@
 use cosmwasm_std::{
-    attr, BankMsg, Deps, DepsMut, Env, HandleResponse, InitResponse, MessageInfo, MigrateResponse,
-    Order, QueryResponse, StdError, StdResult,
+    attr, entry_point, BankMsg, Deps, DepsMut, Env, HandleResponse, InitResponse, MessageInfo,
+    MigrateResponse, Order, QueryResponse, StdError, StdResult,
 };
 
 use crate::msg::{HandleMsg, InitMsg, MigrateMsg, QueryMsg};
@@ -27,6 +27,7 @@ pub fn handle(
     ))
 }
 
+#[entry_point]
 pub fn migrate(
     deps: DepsMut,
     env: Env,

contracts/burner/src/lib.rs

@@ -2,4 +2,4 @@ pub mod contract;
 pub mod msg;
 
 #[cfg(target_arch = "wasm32")]
-cosmwasm_std::create_entry_points_with_migration!(contract);
+cosmwasm_std::create_entry_points!(contract);

contracts/staking/src/contract.rs

@@ -1,7 +1,7 @@
 use cosmwasm_std::{
-    attr, coin, to_binary, BankMsg, Decimal, Deps, DepsMut, Env, HandleResponse, HumanAddr,
-    InitResponse, MessageInfo, QuerierWrapper, QueryResponse, StakingMsg, StdError, StdResult,
-    Uint128, WasmMsg,
+    attr, coin, entry_point, to_binary, BankMsg, Decimal, Deps, DepsMut, Env, HandleResponse,
+    HumanAddr, InitResponse, MessageInfo, QuerierWrapper, QueryResponse, StakingMsg, StdError,
+    StdResult, Uint128, WasmMsg,
 };
 
 use crate::errors::{StakingError, Unauthorized};
@@ -16,6 +16,7 @@ use crate::state::{
 
 const FALLBACK_RATIO: Decimal = Decimal::one();
 
+#[entry_point]
 pub fn init(deps: DepsMut, _env: Env, info: MessageInfo, msg: InitMsg) -> StdResult<InitResponse> {
     // ensure the validator is registered
     let vals = deps.querier.query_validators()?;
@@ -50,6 +51,7 @@ pub fn init(deps: DepsMut, _env: Env, info: MessageInfo, msg: InitMsg) -> StdRes
     Ok(InitResponse::default())
 }
 
+#[entry_point]
 pub fn handle(
     deps: DepsMut,
     env: Env,
@@ -372,6 +374,7 @@ pub fn _bond_all_tokens(
     Ok(res)
 }
 
+#[entry_point]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
     match msg {
         QueryMsg::TokenInfo {} => to_binary(&query_token_info(deps)?),

contracts/staking/src/lib.rs

@@ -2,6 +2,3 @@ pub mod contract;
 mod errors;
 pub mod msg;
 pub mod state;
-
-#[cfg(target_arch = "wasm32")]
-cosmwasm_std::create_entry_points!(contract);

packages/derive/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "cosmwasm-derive"
+version = "0.13.0"
+authors = ["Simon Warta <[email protected]>"]
+edition = "2018"
+description = "Standard library for Wasm based smart contracts on Cosmos blockchains"
+repository = "https://github.com/CosmWasm/cosmwasm/tree/master/packages/std"
+license = "Apache-2.0"
+readme = "README.md"
+
+[lib]
+proc-macro = true
+
+[features]
+default = []
+
+[dependencies]
+syn = { version = "1.0", features = ["full"] }
+
+[dev-dependencies]

packages/derive/src/lib.rs

@@ -0,0 +1,37 @@
+#[macro_use]
+extern crate syn;
+
+use proc_macro::TokenStream;
+use std::str::FromStr;
+
+#[proc_macro_attribute]
+pub fn entry_point(_attr: TokenStream, mut item: TokenStream) -> TokenStream {
+    let cloned = item.clone();
+    let function = parse_macro_input!(cloned as syn::ItemFn);
+    let name = function.sig.ident.to_string();
+    // The first argument is `deps`, the rest is region pointers
+    let args = function.sig.inputs.len() - 1;
+
+    // E.g. "ptr0: u32, ptr1: u32, ptr2: u32,"
+    let typed_ptrs = (0..args).fold(String::new(), |acc, i| format!("{}ptr{}: u32,", acc, i));
+    // E.g. "ptr0, ptr1, ptr2,"
+    let ptrs = (0..args).fold(String::new(), |acc, i| format!("{}ptr{},", acc, i));
+
+    let new_code = format!(
+        r##"
+        #[cfg(target_arch = "wasm32")]
+        mod __wasm_export_{name} {{ // new module to avoid conflict of function name
+            #[no_mangle]
+            extern "C" fn {name}({typed_ptrs}) -> u32 {{
+                cosmwasm_std::do_{name}(&super::{name}, {ptrs})
+            }}
+        }}
+    "##,
+        name = name,
+        typed_ptrs = typed_ptrs,
+        ptrs = ptrs
+    );
+    let entry = TokenStream::from_str(&new_code).unwrap();
+    item.extend(entry);
+    item
+}

packages/std/Cargo.toml

@@ -30,6 +30,7 @@ backtraces = []
 
 [dependencies]
 base64 = "0.13.0"
+cosmwasm-derive = { path = "../derive", version = "0.13.0" }
 serde-json-wasm = { version = "0.2.1" }
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }

packages/std/src/lib.rs

@@ -70,3 +70,8 @@ pub mod testing {
         MockStorage, StakingQuerier, MOCK_CONTRACT_ADDR,
     };
 }
+
+// Re-exports
+
+extern crate cosmwasm_derive;
+pub use cosmwasm_derive::entry_point;