Fix/optimizer

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

@@ -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/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/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-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/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
 }

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(),
     )
-}
+}