Merge pull request #32 from CosmWasm/update-to-rust-1.50.0

Update to rust 1.50.0

Author: webmaster128

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.10.8
+
+- `cosmwasm/rust-optimizer`: bump Rust to 1.50.0
+- `cosmwasm/workspace-optimizer`: bump Rust to nightly-2021-03-01
+
 ## 0.10.7
 
 - Add shared build cache (sccache) to rust-optimizer

Makefile

@@ -2,7 +2,7 @@
 
 DOCKER_NAME_RUST_OPTIMIZER := "cosmwasm/rust-optimizer"
 DOCKER_NAME_WORKSPACE_OPTIMIZER := "cosmwasm/workspace-optimizer"
-DOCKER_TAG := 0.10.7
+DOCKER_TAG := 0.10.8
 
 build-rust-optimizer:
 	docker build -t $(DOCKER_NAME_RUST_OPTIMIZER):$(DOCKER_TAG) --file rust-optimizer.Dockerfile .

README.md

@@ -24,7 +24,7 @@ you to produce a smaller build that works with the cosmwasm integration tests
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.10.7
+  cosmwasm/rust-optimizer:0.10.8
 ```
 
 Demo this with `cosmwasm-examples` (going into eg. `erc20` subdir before running),
@@ -57,7 +57,7 @@ To compile all contracts in the workspace deterministically, you can run:
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/workspace-optimizer:0.10.7
+  cosmwasm/workspace-optimizer:0.10.8
 ```
 
 The downside is that to verify one contract in the workspace, you need to compile them
@@ -83,7 +83,7 @@ case, we can use the optimize.sh command:
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.10.7 ./contracts/burner
+  cosmwasm/rust-optimizer:0.10.8 ./contracts/burner
 ```
 
 ## Development

rust-optimizer.Dockerfile

@@ -1,13 +1,13 @@
 # Note: I tried slim and had issues compiling wasm-pack, even with --features vendored-openssl
-FROM rust:1.47.0
+FROM rust:1.50.0
 
 # setup rust with Wasm support
 RUN rustup target add wasm32-unknown-unknown
 
 # Install sccache from https://crates.io/crates/sccache
 # This is slow due to full release compilation from source.
 # Use full version string here to ensure Docker caching works well.
-RUN cargo install --version 0.2.13 sccache
+RUN cargo install --version 0.2.15 sccache
 
 # Download binaryen and verify checksum
 ADD https://github.com/WebAssembly/binaryen/releases/download/version_96/binaryen-version_96-x86_64-linux.tar.gz /tmp/binaryen.tar.gz

workspace-optimizer.Dockerfile

@@ -1,7 +1,7 @@
 # This version of Rust will not be used for compilation but just serves as a stable base image to get debian+rustup.
 # See Rust nightly config below.
-FROM rust:1.47.0
-RUN rustup toolchain remove 1.47.0
+FROM rust:1.50.0
+RUN rustup toolchain remove 1.50.0
 
 RUN apt update
 RUN apt install python3 python3-toml -y
@@ -10,8 +10,8 @@ RUN python3 --version
 
 # Install Rust nightly
 # Choose version from: https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html
-RUN rustup toolchain install nightly-2020-10-14 --allow-downgrade --profile minimal --target wasm32-unknown-unknown
-RUN rustup default nightly-2020-10-14
+RUN rustup toolchain install nightly-2021-03-01 --allow-downgrade --profile minimal --target wasm32-unknown-unknown
+RUN rustup default nightly-2021-03-01
 RUN rustup toolchain list
 # Check cargo version
 RUN cargo --version