From a862d63af340da08099fe6391281a7cc2713cf67 Mon Sep 17 00:00:00 2001 From: deuszx <95355183+deuszx@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:07:36 +0100 Subject: [PATCH] Use branch'd `ink-wrapper` for compatibility with aleph-node 12.1 release (#23) --- Dockerfile | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b05ee9..44703eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH \ RUST_VERSION=1.71.0 \ CARGO_CONTRACT_VERSION=3.2.0 \ - INK_WRAPPER_VERSION=0.6.1 + INK_WRAPPER_VERSION=57fde9f0e31f1de610efe1879715c028849f4bc0 LABEL cargo-contract="$CARGO_CONTRACT_VERSION" \ rust="$RUST_VERSION" \ - ink-wrapper="$INK_WRAPPER_VERSION" + ink-wrapper="rev-$INK_WRAPPER_VERSION" # Minimal Rust dependencies. RUN set -eux \ @@ -64,7 +64,7 @@ RUN rm -rf cargo-contract FROM slimmed-rust as ink-wrapper-builder RUN rustup toolchain install nightly-2023-04-20 \ - && cargo +nightly-2023-04-20 install ink-wrapper --version ${INK_WRAPPER_VERSION} --locked --force + && cargo +nightly-2023-04-20 install ink-wrapper --git https://github.com/Cardinal-Cryptography/ink-wrapper.git --rev ${INK_WRAPPER_VERSION} --locked --force # # ink! 4.0 optimizer diff --git a/Makefile b/Makefile index 4908cc5..e22cd54 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MAKEFILE_NAME := Ink development docker DOCKER_NAME_INK_DEV := cardinal-cryptography/ink-dev -DOCKER_TAG := 1.8.0 +DOCKER_TAG := 2.0.0 # Native arch BUILDARCH := $(shell uname -m)