cw1-whitelist-ng: Benchmarking

Cargo.toml

@@ -1,6 +1,9 @@
 [workspace]
 members = ["packages/*", "contracts/*"]
 
+[patch.crates-io]
+cosmwasm-std = { git = "https://github.com/CosmWasm/cosmwasm", branch = "lazy-deserialized-ep" }
+
 [profile.release.package.cw1-subkeys]
 codegen-units = 1
 incremental = false

contracts/cw1-whitelist-ng/Cargo.toml

@@ -37,5 +37,6 @@ anyhow = { version = "1", optional = true }
 anyhow = "1"
 assert_matches = "1"
 cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-vm = "1.0.0-beta"
 cw-multi-test = { path = "../../packages/multi-test", version = "0.10.2" }
 derivative = "2"

contracts/cw1-whitelist-ng/src/contract.rs

@@ -213,7 +213,7 @@ mod tests {
     fn instantiate_and_modify_config() {
         let contract = Cw1WhitelistContract::native();
 
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";
@@ -292,7 +292,7 @@ mod tests {
     #[test]
     fn execute_messages_has_proper_permissions() {
         let contract = Cw1WhitelistContract::native();
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";
@@ -342,7 +342,7 @@ mod tests {
     #[test]
     fn execute_custom_messages_works() {
         let contract = Cw1WhitelistContract::<String>::new();
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
         let alice = "alice";
 
         let admins = vec![alice.to_owned()];
@@ -371,7 +371,7 @@ mod tests {
     #[test]
     fn can_execute_query_works() {
         let contract = Cw1WhitelistContract::native();
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";

contracts/cw1-whitelist-ng/src/lib.rs

@@ -10,32 +10,34 @@ pub mod state;
 mod entry_points {
     use crate::error::ContractError;
     use crate::state::Cw1WhitelistContract;
-    use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response};
+    use cosmwasm_std::{
+        entry_point_lazy, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response,
+    };
 
     const CONTRACT: Cw1WhitelistContract<Empty> = Cw1WhitelistContract::native();
 
-    #[entry_point]
+    #[entry_point_lazy]
     pub fn instantiate(
         deps: DepsMut,
         env: Env,
         info: MessageInfo,
-        msg: Binary,
+        msg: Vec<u8>,
     ) -> Result<Response, ContractError> {
         CONTRACT.entry_instantiate(deps, env, info, &msg)
     }
 
-    #[entry_point]
+    #[entry_point_lazy]
     pub fn execute(
         deps: DepsMut,
         env: Env,
         info: MessageInfo,
-        msg: Binary,
+        msg: Vec<u8>,
     ) -> Result<Response, ContractError> {
         CONTRACT.entry_execute(deps, env, info, &msg)
     }
 
-    #[entry_point]
-    pub fn query(deps: Deps, env: Env, msg: Binary) -> Result<Binary, ContractError> {
+    #[entry_point_lazy]
+    pub fn query(deps: Deps, env: Env, msg: Vec<u8>) -> Result<Binary, ContractError> {
         CONTRACT.entry_query(deps, env, &msg)
     }
 }

contracts/cw1-whitelist-ng/tests/gas_bench.rs

@@ -0,0 +1,63 @@
+use cosmwasm_std::Empty;
+use cosmwasm_std::{coins, to_binary, BankMsg, Response, WasmMsg};
+use cosmwasm_vm::testing::{
+    execute, instantiate, mock_env, mock_info, mock_instance_with_gas_limit,
+};
+use cw1_whitelist_ng::msg::{Cw1ExecMsg, InstantiateMsg, WhitelistExecMsg};
+
+static WASM: &[u8] = include_bytes!("../../../artifacts/cw1_whitelist_ng.wasm");
+
+#[test]
+fn execute_bench() {
+    let mut deps = mock_instance_with_gas_limit(WASM, 100_000_000_000_000);
+
+    let alice = "alice";
+    let bob = "bob";
+    let carl = "carl";
+
+    // instantiate the contract
+    let instantiate_msg = InstantiateMsg {
+        admins: vec![alice.to_string(), carl.to_string()],
+        mutable: false,
+    };
+    let info = mock_info(&bob, &[]);
+
+    let init_gas = deps.get_gas_left();
+
+    let _: Response = instantiate(&mut deps, mock_env(), info, instantiate_msg).unwrap();
+
+    let gas_after_instantiation = deps.get_gas_left();
+
+    let freeze = WhitelistExecMsg::Freeze {};
+    let msgs = vec![
+        BankMsg::Send {
+            to_address: bob.to_string(),
+            amount: coins(10000, "DAI"),
+        }
+        .into(),
+        WasmMsg::Execute {
+            contract_addr: "some contract".into(),
+            msg: to_binary(&freeze).unwrap(),
+            funds: vec![],
+        }
+        .into(),
+    ];
+
+    // make some nice message
+    let execute_msg = Cw1ExecMsg::<Empty>::Execute { msgs: msgs.clone() };
+
+    // but carl can
+    let info = mock_info(&carl, &[]);
+    let _: Response = execute(&mut deps, mock_env(), info, execute_msg).unwrap();
+
+    let gas_after_execution = deps.get_gas_left();
+
+    println!(
+        "Instantiation gas usage: {}",
+        init_gas - gas_after_instantiation
+    );
+    println!(
+        "Execution gas usage: {}",
+        gas_after_instantiation - gas_after_execution
+    );
+}

contracts/cw1-whitelist/Cargo.toml

@@ -22,7 +22,7 @@ test-utils = []
 cw0 = { path = "../../packages/cw0", version = "0.10.2" }
 cw1 = { path = "../../packages/cw1", version = "0.10.2" }
 cw2 = { path = "../../packages/cw2", version = "0.10.2" }
-cosmwasm-std = { version = "1.0.0-beta", features = ["staking"] }
+cosmwasm-std = { version = "1.0.0-beta", features = ["staking"]  }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.10.2" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -32,5 +32,6 @@ thiserror = { version = "1.0.23" }
 anyhow = "1"
 assert_matches = "1"
 cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-vm = "1.0.0-beta"
 cw-multi-test = { path = "../../packages/multi-test", version = "0.10.2" }
 derivative = "2"

contracts/cw1-whitelist/src/contract.rs

@@ -149,7 +149,7 @@ mod tests {
 
     #[test]
     fn instantiate_and_modify_config() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";
@@ -219,7 +219,7 @@ mod tests {
 
     #[test]
     fn execute_messages_has_proper_permissions() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";
@@ -268,7 +268,7 @@ mod tests {
 
     #[test]
     fn can_execute_query_works() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_dependencies();
 
         let alice = "alice";
         let bob = "bob";

contracts/cw1-whitelist/tests/gas_bench.rs

@@ -0,0 +1,63 @@
+use cosmwasm_std::Empty;
+use cosmwasm_std::{coins, to_binary, BankMsg, Response, WasmMsg};
+use cosmwasm_vm::testing::{
+    execute, instantiate, mock_env, mock_info, mock_instance_with_gas_limit,
+};
+use cw1_whitelist::msg::{ExecuteMsg, InstantiateMsg};
+
+static WASM: &[u8] = include_bytes!("../../../artifacts/cw1_whitelist.wasm");
+
+#[test]
+fn execute_bench() {
+    let mut deps = mock_instance_with_gas_limit(WASM, 100_000_000_000_000);
+
+    let alice = "alice";
+    let bob = "bob";
+    let carl = "carl";
+
+    // instantiate the contract
+    let instantiate_msg = InstantiateMsg {
+        admins: vec![alice.to_string(), carl.to_string()],
+        mutable: false,
+    };
+    let info = mock_info(&bob, &[]);
+
+    let init_gas = deps.get_gas_left();
+
+    let _: Response = instantiate(&mut deps, mock_env(), info, instantiate_msg).unwrap();
+
+    let gas_after_instantiation = deps.get_gas_left();
+
+    let freeze: ExecuteMsg<Empty> = ExecuteMsg::Freeze {};
+    let msgs = vec![
+        BankMsg::Send {
+            to_address: bob.to_string(),
+            amount: coins(10000, "DAI"),
+        }
+        .into(),
+        WasmMsg::Execute {
+            contract_addr: "some contract".into(),
+            msg: to_binary(&freeze).unwrap(),
+            funds: vec![],
+        }
+        .into(),
+    ];
+
+    // make some nice message
+    let execute_msg = ExecuteMsg::<Empty>::Execute { msgs: msgs.clone() };
+
+    // but carl can
+    let info = mock_info(&carl, &[]);
+    let _: Response = execute(&mut deps, mock_env(), info, execute_msg).unwrap();
+
+    let gas_after_execution = deps.get_gas_left();
+
+    println!(
+        "Instantiation gas usage: {}",
+        init_gas - gas_after_instantiation
+    );
+    println!(
+        "Execution gas usage: {}",
+        gas_after_instantiation - gas_after_execution
+    );
+}