Fix/optimizer (#72)

#65 small fix / follow-up.

Gates `library` feature included code not to be in the final wasm

Cargo.toml

@@ -36,9 +36,9 @@ blst = "0.3.11"
 cosmos-sdk-proto = { version = "0.19.0", default-features = false, features = [
     "cosmwasm",
 ] }
-cosmwasm-derive = "2.0.4"
-cosmwasm-schema = "2.0.4"
-cosmwasm-std = { version = "2.0.4", default-features = false, features = [
+cosmwasm-derive = "2.1.4"
+cosmwasm-schema = "2.1.4"
+cosmwasm-std = { version = "2.1.4", default-features = false, features = [
     "std",
     "abort",
     "staking",
@@ -67,7 +67,7 @@ rust_decimal = "1.35"
 k256 = { version = "0.13.1", default-features = false, features = ["schnorr"] }
 
 # dev deps
-cosmwasm-vm = { version = "2.0.4", default-features = false, features = [
+cosmwasm-vm = { version = "2.1.4", default-features = false, features = [
     "iterator",
     "stargate",
 ] }

contracts/babylon/schema/babylon-contract.json

@@ -131,7 +131,7 @@
             ],
             "properties": {
               "headers": {
-                "description": "`headers` is a list of BTC headers. Typically: - A given delta of headers a user wants to add to the tip of, or fork the BTC chain.",
+                "description": "`headers` is a list of BTC headers. Typically: - A given delta of headers a user wants to add to the tip or fork of the BTC chain.",
                 "type": "array",
                 "items": {
                   "$ref": "#/definitions/BtcHeader"
@@ -540,7 +540,8 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "MigrateMsg",
     "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-    "type": "object"
+    "type": "object",
+    "additionalProperties": false
   },
   "sudo": null,
   "responses": {

contracts/babylon/schema/raw/execute.json

@@ -15,7 +15,7 @@
           ],
           "properties": {
             "headers": {
-              "description": "`headers` is a list of BTC headers. Typically: - A given delta of headers a user wants to add to the tip of, or fork the BTC chain.",
+              "description": "`headers` is a list of BTC headers. Typically: - A given delta of headers a user wants to add to the tip or fork of the BTC chain.",
               "type": "array",
               "items": {
                 "$ref": "#/definitions/BtcHeader"

contracts/babylon/schema/raw/migrate.json

@@ -2,5 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "MigrateMsg",
   "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }

contracts/babylon/src/contract.rs

@@ -64,7 +64,7 @@ pub fn instantiate(
         let init_msg = SubMsg::reply_on_success(init_msg, REPLY_ID_INSTANTIATE_STAKING);
 
         // Test code sets a channel, so that we can better approximate IBC in test code
-        #[cfg(any(test, feature = "library"))]
+        #[cfg(any(test, all(feature = "library", not(target_arch = "wasm32"))))]
         {
             let channel = cosmwasm_std::testing::mock_ibc_channel(
                 "channel-123",

contracts/babylon/src/msg/contract.rs

@@ -1,14 +1,20 @@
-use crate::msg::btc_header::{BtcHeader, BtcHeaderResponse, BtcHeadersResponse};
-use crate::msg::cz_header::CzHeaderResponse;
-use crate::msg::epoch::EpochResponse;
-use crate::state::config::Config;
-use babylon_apis::finality_api::Evidence;
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{Binary, StdError, StdResult};
 
+use babylon_apis::finality_api::Evidence;
+
+use crate::msg::btc_header::BtcHeader;
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    crate::msg::btc_header::{BtcHeaderResponse, BtcHeadersResponse},
+    crate::msg::cz_header::CzHeaderResponse,
+    crate::msg::epoch::EpochResponse,
+    crate::state::config::Config,
+};
+
 const BABYLON_TAG_BYTES: usize = 4;
 
-// common functions for contract msgs
+// Common functions for contract messages
 pub trait ContractMsg {
     fn validate(&self) -> StdResult<()>;
     fn babylon_tag_to_bytes(&self) -> StdResult<Vec<u8>>;
@@ -94,7 +100,7 @@ impl ContractMsg for InstantiateMsg {
 pub enum ExecuteMsg {
     BtcHeaders {
         /// `headers` is a list of BTC headers. Typically:
-        /// - A given delta of headers a user wants to add to the tip of, or fork the BTC chain.
+        /// - A given delta of headers a user wants to add to the tip or fork of the BTC chain.
         headers: Vec<BtcHeader>,
     },
     /// `slashing` is a slashing event from the BTC staking contract.

contracts/btc-finality/schema/btc-finality.json

@@ -841,7 +841,8 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "MigrateMsg",
     "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-    "type": "object"
+    "type": "object",
+    "additionalProperties": false
   },
   "sudo": null,
   "responses": {

contracts/btc-finality/schema/raw/migrate.json

@@ -2,5 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "MigrateMsg",
   "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }

contracts/btc-finality/src/msg.rs

@@ -1,9 +1,13 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cw_controllers::AdminResponse;
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    crate::state::config::Config, babylon_apis::finality_api::PubRandCommit,
+    cw_controllers::AdminResponse,
+};
 
-use babylon_apis::finality_api::{Evidence, IndexedBlock, PubRandCommit};
+use babylon_apis::finality_api::{Evidence, IndexedBlock};
 
-use crate::state::config::{Config, Params};
+use crate::state::config::Params;
 
 #[cw_serde]
 #[derive(Default)]

contracts/btc-staking/schema/btc-staking.json

@@ -841,7 +841,8 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "MigrateMsg",
     "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-    "type": "object"
+    "type": "object",
+    "additionalProperties": false
   },
   "sudo": null,
   "responses": {

contracts/btc-staking/schema/raw/migrate.json

@@ -2,5 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "MigrateMsg",
   "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }

contracts/btc-staking/src/msg.rs

@@ -1,9 +1,13 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cw_controllers::AdminResponse;
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    crate::state::config::Config, babylon_apis::btc_staking_api::ActiveBtcDelegation,
+    cw_controllers::AdminResponse,
+};
 
-use babylon_apis::btc_staking_api::{ActiveBtcDelegation, FinalityProvider};
+use babylon_apis::btc_staking_api::FinalityProvider;
 
-use crate::state::config::{Config, Params};
+use crate::state::config::Params;
 use crate::state::staking::BtcDelegation;
 
 #[cw_serde]

contracts/op-finality-gadget/schema/op-finality-gadget.json

@@ -336,7 +336,8 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "MigrateMsg",
     "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-    "type": "object"
+    "type": "object",
+    "additionalProperties": false
   },
   "sudo": null,
   "responses": {

contracts/op-finality-gadget/schema/raw/migrate.json

@@ -2,5 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "MigrateMsg",
   "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }

contracts/op-finality-gadget/src/msg.rs

@@ -1,10 +1,13 @@
-use crate::state::config::Config;
-use babylon_apis::finality_api::PubRandCommit;
-use babylon_merkle::Proof;
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    crate::state::config::Config, babylon_apis::finality_api::PubRandCommit,
+    cw_controllers::AdminResponse, std::collections::HashSet,
+};
+
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::Binary;
-use cw_controllers::AdminResponse;
-use std::collections::HashSet;
+
+use babylon_merkle::Proof;
 
 #[cw_serde]
 pub struct InstantiateMsg {

docker/Dockerfile-arm64

@@ -1,4 +1,4 @@
-FROM cosmwasm/rust-optimizer-arm64:0.16.0 AS rust-optimizer
+FROM cosmwasm/optimizer-arm64:0.16.0 AS rust-optimizer
 
 # clang and llvm are required for compiling rust-secp256k1 in rust-bitcoin
 RUN apk update && \

docker/Dockerfile-ci

@@ -1,4 +1,4 @@
-FROM cosmwasm/rust-optimizer:0.16.0 AS rust-optimizer
+FROM cosmwasm/optimizer:0.16.0 AS rust-optimizer
 
 # clang and llvm are required for compiling rust-secp256k1 in rust-bitcoin
 RUN apk update && \

docker/Dockerfile-x86_64

@@ -1,4 +1,4 @@
-FROM cosmwasm/rust-optimizer:0.16.0 AS rust-optimizer
+FROM cosmwasm/optimizer:0.16.0 AS rust-optimizer
 
 # clang and llvm are required for compiling rust-secp256k1 in rust-bitcoin
 RUN apk update && \

packages/test-utils/src/lib.rs

@@ -341,4 +341,4 @@ pub fn get_public_randomness_commitment() -> (String, PubRandCommit, Vec<u8>) {
         },
         pub_rand_commitment_msg.sig.to_vec(),
     )
-}
+}