From 40e5488825af8a951ef3ad25f88aaccafb81ea5d Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Thu, 17 Nov 2022 18:28:26 +0100
Subject: [PATCH 01/28] pull paritytech ink-ci-linux

---
 Makefile           | 3 ++-
 sysbox/on-start.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 37cd2c24f..438b8bc22 100644
--- a/Makefile
+++ b/Makefile
@@ -243,8 +243,9 @@ docker-shell:
 	  --runtime=sysbox-runc \
 	  -it \
 	  --volume /tmp:/tmp \
+	  --volume cache:/cache \
 	  --entrypoint /bin/bash \
-	  --publish $(DOCKER_PORT):4000 \
+	  --publish 5000:4000 \
 	  ink-playground
 
 docker-log:
diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 40c2bf055..5eaf4fd88 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -5,8 +5,8 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull achimcc/ink-compiler:latest
-docker tag achimcc/ink-compiler ink-compiler
+docker pull paritytech/ink-ci-linux:production
+docker tag paritytech/ink-ci-linux ink-compiler
 
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist

From 51322ac2d8d9429ac3bf14b773ea230f8ad618eb Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Thu, 17 Nov 2022 18:31:41 +0100
Subject: [PATCH 02/28] run ink-compiler with volume

---
 crates/sandbox/src/build_command.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index d2da843b1..56184d16b 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -104,6 +104,8 @@ fn build_basic_secure_docker_command() -> Command {
         DOCKER_WORKDIR,
         "--net",
         "none",
+        "--volume:",
+        "cache:/usr/local/cargo/registry:ro",
         "--memory",
         "1024m",
         "--memory-swap",

From ac855f8656fa918c48ac21d178879cf0fb516c3a Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Thu, 17 Nov 2022 18:34:35 +0100
Subject: [PATCH 03/28] pr-build cached dependencies

---
 sysbox/on-start.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 5eaf4fd88..dfd26ad33 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -8,6 +8,8 @@ sleep 2
 docker pull paritytech/ink-ci-linux:production
 docker tag paritytech/ink-ci-linux ink-compiler
 
+docker run --volume cache:/usr/local/cargo/registry:ro --workdir /builds/contract/  ink-compiler cargo contract build
+
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist
 

From ab4e18ac06084b73e63b5e0e85c4dc7e571ec018 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Thu, 17 Nov 2022 18:36:07 +0100
Subject: [PATCH 04/28] remove compiler docker

---
 .github/workflows/compiler_docker.yml | 31 ---------------------------
 Dockerfile.compiler                   | 17 ---------------
 2 files changed, 48 deletions(-)
 delete mode 100644 .github/workflows/compiler_docker.yml
 delete mode 100644 Dockerfile.compiler

diff --git a/.github/workflows/compiler_docker.yml b/.github/workflows/compiler_docker.yml
deleted file mode 100644
index f911d33bb..000000000
--- a/.github/workflows/compiler_docker.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Compiler_Docker
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  build:
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build docker
-        run: docker build -f Dockerfile.compiler --tag ink-compiler .
-
-      - name: Login to DockerHub
-        if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER_NAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      - name: Tag Docker image
-        if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
-        run: docker tag ink-compiler:latest ${{ secrets.DOCKER_USER_NAME }}/ink-compiler
-
-      - name: Push Docker image
-        if: github.ref == 'refs/heads/main' && github.repository == 'paritytech/ink-playground'
-        run: docker push ${{ secrets.DOCKER_USER_NAME }}/ink-compiler
diff --git a/Dockerfile.compiler b/Dockerfile.compiler
deleted file mode 100644
index aa956e95e..000000000
--- a/Dockerfile.compiler
+++ /dev/null
@@ -1,17 +0,0 @@
-ARG REGISTRY_PATH=docker.io/paritytech
-
-FROM ${REGISTRY_PATH}/ink-ci-linux:production
-
-ENV CARGO_TARGET_DIR="/target"
-
-# Instantiate new Contract
-RUN cargo contract new contract
-
-# Provide Cargo.toml with all ink! dependencies
-COPY crates/contract/Cargo.toml /builds/contract/Cargo.toml
-
-# Pre-build ink! dependencies
-RUN cd contract && cargo contract build
-RUN cd contract && cargo test
-
-WORKDIR /builds/contract

From a9a6ffb01d0eedc9bbf2bb70aed629b1c3c2ada9 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 09:20:14 +0100
Subject: [PATCH 05/28] longer docker timeout in CI

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 435c0a28f..56d1c10fb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -37,10 +37,10 @@ jobs:
         env:
           DOCKER_PORT: 4000
 
-      - name: Sleep for 120s, allow Docker image to boot up
+      - name: Sleep for 300s, allow Docker image to boot up
         uses: juliangruber/sleep-action@v1
         with:
-          time: 120s
+          time: 300s
 
       - name: Install docker-tests
         run: yarn workspace docker-tests install

From 8ae3d5376b843a592f3540af7e0db1a5af3f25ab Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 11:35:01 +0100
Subject: [PATCH 06/28] use correct volumes

---
 crates/sandbox/src/build_command.rs | 4 +++-
 sysbox/on-start.sh                  | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index 56184d16b..cacd7ef79 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -71,7 +71,7 @@ pub fn build_formatting_command(input_file: &Path) -> Command {
 
 fn build_docker_command(input_file: &Path, output_dir: Option<&Path>) -> Command {
     let file_name = "lib.rs";
-
+    let input_file = "builds";
     let mut mount_input_file = input_file.as_os_str().to_os_string();
     mount_input_file.push(":");
     mount_input_file.push(DOCKER_WORKDIR);
@@ -106,6 +106,8 @@ fn build_basic_secure_docker_command() -> Command {
         "none",
         "--volume:",
         "cache:/usr/local/cargo/registry:ro",
+        "--volume:",
+        "builds:/builds:ro",
         "--memory",
         "1024m",
         "--memory-swap",
diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index dfd26ad33..9b9d57db8 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -5,10 +5,11 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull paritytech/ink-ci-linux:production
+docker pull paritytech/ink-ci-linux
 docker tag paritytech/ink-ci-linux ink-compiler
 
-docker run --volume cache:/usr/local/cargo/registry:ro --workdir /builds/contract/  ink-compiler cargo contract build
+docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds ink-compiler cargo contract new contract
+docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
 
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist

From a38d42f9ebe05ca0e285b6a83f55ed86b3a935b2 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 11:42:56 +0100
Subject: [PATCH 07/28] remove builds volume

---
 crates/sandbox/src/build_command.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index cacd7ef79..56184d16b 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -71,7 +71,7 @@ pub fn build_formatting_command(input_file: &Path) -> Command {
 
 fn build_docker_command(input_file: &Path, output_dir: Option<&Path>) -> Command {
     let file_name = "lib.rs";
-    let input_file = "builds";
+
     let mut mount_input_file = input_file.as_os_str().to_os_string();
     mount_input_file.push(":");
     mount_input_file.push(DOCKER_WORKDIR);
@@ -106,8 +106,6 @@ fn build_basic_secure_docker_command() -> Command {
         "none",
         "--volume:",
         "cache:/usr/local/cargo/registry:ro",
-        "--volume:",
-        "builds:/builds:ro",
         "--memory",
         "1024m",
         "--memory-swap",

From 088ce67f0c7065dcdc7a48c226a713a94f53a422 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 13:54:13 +0100
Subject: [PATCH 08/28] use ink-ci-linux:production

---
 sysbox/on-start.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 9b9d57db8..d2b4b8053 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -5,8 +5,8 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull paritytech/ink-ci-linux
-docker tag paritytech/ink-ci-linux ink-compiler
+docker pull paritytech/ink-ci-linux:production
+docker tag paritytech/ink-ci-linux:production ink-compiler
 
 docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds ink-compiler cargo contract new contract
 docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build

From 331c8060cf330a640275a167b5a4d49b56103768 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 17:09:16 +0100
Subject: [PATCH 09/28] fix mount volume

---
 Dockerfile                          | 2 ++
 crates/sandbox/src/build_command.rs | 4 +++-
 sysbox/on-start.sh                  | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cee52537d..ff535b171 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -124,6 +124,8 @@ RUN apt-get --yes install docker-ce docker-ce-cli \
 COPY sysbox/on-start.sh /usr/bin
 RUN chmod +x /usr/bin/on-start.sh
 
+COPY crates/contract builds/contract
+
 # Entrypoint
 
 ENTRYPOINT [ "on-start.sh" ]
diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index 56184d16b..6e61baa52 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -104,8 +104,10 @@ fn build_basic_secure_docker_command() -> Command {
         DOCKER_WORKDIR,
         "--net",
         "none",
-        "--volume:",
+        "--volume",
         "cache:/usr/local/cargo/registry:ro",
+        "--volume",
+        "/builds:/builds",
         "--memory",
         "1024m",
         "--memory-swap",
diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index d2b4b8053..3d5ccdbbe 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -8,8 +8,7 @@ sleep 2
 docker pull paritytech/ink-ci-linux:production
 docker tag paritytech/ink-ci-linux:production ink-compiler
 
-docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds ink-compiler cargo contract new contract
-docker run --volume cache:/usr/local/cargo/registry --volume builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
 
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist

From 1f39591fca6e3169fc03342c3ca30e768ca755af Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 17:47:29 +0100
Subject: [PATCH 10/28] cache Smart contract testing

---
 sysbox/on-start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 3d5ccdbbe..9d818faaa 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -9,7 +9,7 @@ docker pull paritytech/ink-ci-linux:production
 docker tag paritytech/ink-ci-linux:production ink-compiler
 
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
-
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist
 

From f0fbedfa737cca9d767b127d35245dee9e24aee4 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 18:07:25 +0100
Subject: [PATCH 11/28] add Cargo.toml volume

---
 crates/sandbox/src/build_command.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index 6e61baa52..50f900296 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -107,7 +107,7 @@ fn build_basic_secure_docker_command() -> Command {
         "--volume",
         "cache:/usr/local/cargo/registry:ro",
         "--volume",
-        "/builds:/builds",
+        "/builds/contract/Cargo.toml:/builds/contract/Cargo.toml",
         "--memory",
         "1024m",
         "--memory-swap",

From 69854c29359919c498906b5f223bd6b1a6902b1b Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 18:16:11 +0100
Subject: [PATCH 12/28] update ci

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 71e77bfaa..0b4902ac9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -55,8 +55,8 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Pull docker image
-        run: docker pull docker.io/achimcc/ink-compiler:latest
+        run: docker pull docker.io/paritytech/ink-ci-linux:production
       - name: Tag docker image
-        run: docker tag docker.io/achimcc/ink-compiler:latest ink-compiler
+        run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose

From f4bbb1fa841c932eb8a0c77a1d833f4a060d5f35 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Mon, 21 Nov 2022 18:23:13 +0100
Subject: [PATCH 13/28] pre-build compilation cache in ci

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0b4902ac9..39312b4a4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -58,5 +58,7 @@ jobs:
         run: docker pull docker.io/paritytech/ink-ci-linux:production
       - name: Tag docker image
         run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
+      - name: pre-build compilation cache
+        run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose

From 55c77866e11d81235dd7838a6cbf8f599e1399df Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 11:25:21 +0100
Subject: [PATCH 14/28] use other docker image

---
 crates/contract/lib.rs | 33 ++++++++++++++++++++++++---------
 sysbox/on-start.sh     |  4 ++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/crates/contract/lib.rs b/crates/contract/lib.rs
index 58f191054..a5b7327a3 100755
--- a/crates/contract/lib.rs
+++ b/crates/contract/lib.rs
@@ -1,54 +1,69 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[ink::contract]
-pub mod flipper {
+mod flipper {
+
+    /// Defines the storage of your contract.
+    /// Add new fields to the below struct in order
+    /// to add new static storage fields to your contract.
     #[ink(storage)]
     pub struct Flipper {
+        /// Stores a single `bool` value on the storage.
         value: bool,
     }
 
     impl Flipper {
-        /// Creates a new flipper smart contract initialized with the given value.
+        /// Constructor that initializes the `bool` value to the given `init_value`.
         #[ink(constructor)]
         pub fn new(init_value: bool) -> Self {
             Self { value: init_value }
         }
 
-        /// Creates a new flipper smart contract initialized to `false`.
+        /// Constructor that initializes the `bool` value to `false`.
+        ///
+        /// Constructors can delegate to other constructors.
         #[ink(constructor)]
         pub fn default() -> Self {
             Self::new(Default::default())
         }
 
-        /// Flips the current value of the Flipper's boolean.
+        /// A message that can be called on instantiated contracts.
+        /// This one flips the value of the stored `bool` from `true`
+        /// to `false` and vice versa.
         #[ink(message)]
         pub fn flip(&mut self) {
             self.value = !self.value;
         }
 
-        /// Returns the current value of the Flipper's boolean.
+        /// Simply returns the current value of our `bool`.
         #[ink(message)]
         pub fn get(&self) -> bool {
             self.value
         }
     }
 
+    /// Unit tests in Rust are normally defined within such a `#[cfg(test)]`
+    /// module and test functions are marked with a `#[test]` attribute.
+    /// The below code is technically just normal Rust code.
     #[cfg(test)]
     mod tests {
+        /// Imports all the definitions from the outer scope so we can use them here.
         use super::*;
 
+        /// We test if the default constructor does its job.
         #[ink::test]
         fn default_works() {
             let flipper = Flipper::default();
-            assert!(!flipper.get());
+            assert_eq!(flipper.get(), false);
         }
 
+        /// We test a simple use case of our contract.
         #[ink::test]
         fn it_works() {
             let mut flipper = Flipper::new(false);
-            assert!(!flipper.get());
+            assert_eq!(flipper.get(), false);
             flipper.flip();
-            assert!(flipper.get());
+            assert_eq!(flipper.get(), true);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 9d818faaa..7ebb8019a 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -5,8 +5,8 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull paritytech/ink-ci-linux:production
-docker tag paritytech/ink-ci-linux:production ink-compiler
+docker pull paritytech/ink-ci-linux:ae24bd7a-20221109
+docker tag paritytech/ink-ci-linux:ae24bd7a-20221109 ink-compiler
 
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test

From e97414856a35a13d3ee34dd9122da15e76d50a71 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 11:25:43 +0100
Subject: [PATCH 15/28] use other docker image in CI

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 39312b4a4..095bbeccb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -55,9 +55,9 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Pull docker image
-        run: docker pull docker.io/paritytech/ink-ci-linux:production
+        run: docker pull docker.io/paritytech/ink-ci-linux::ae24bd7a-20221109
       - name: Tag docker image
-        run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
+        run: docker tag docker.io/paritytech/ink-ci-linux::ae24bd7a-20221109 ink-compiler
       - name: pre-build compilation cache
         run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests

From 52c643f1a975782be926e08e4d8f3a03142c1cf3 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 19:33:07 +0100
Subject: [PATCH 16/28] use ink prod image

---
 sysbox/on-start.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 7ebb8019a..9d818faaa 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -5,8 +5,8 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull paritytech/ink-ci-linux:ae24bd7a-20221109
-docker tag paritytech/ink-ci-linux:ae24bd7a-20221109 ink-compiler
+docker pull paritytech/ink-ci-linux:production
+docker tag paritytech/ink-ci-linux:production ink-compiler
 
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test

From 26365b44582f39fdbf90335f5e4d3b3cdfd83d8e Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 19:41:24 +0100
Subject: [PATCH 17/28] ci use prod image

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 095bbeccb..39312b4a4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -55,9 +55,9 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Pull docker image
-        run: docker pull docker.io/paritytech/ink-ci-linux::ae24bd7a-20221109
+        run: docker pull docker.io/paritytech/ink-ci-linux:production
       - name: Tag docker image
-        run: docker tag docker.io/paritytech/ink-ci-linux::ae24bd7a-20221109 ink-compiler
+        run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
       - name: pre-build compilation cache
         run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests

From 6b07bdd55c6c5aa36dba6de83978f66e87e5754b Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 19:52:03 +0100
Subject: [PATCH 18/28] CI: copy contract folder

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 39312b4a4..9878719e2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -58,6 +58,8 @@ jobs:
         run: docker pull docker.io/paritytech/ink-ci-linux:production
       - name: Tag docker image
         run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
+      - name: Copy contract folder
+        run: mkdir builds && cp -R crates/contract builds/contract
       - name: pre-build compilation cache
         run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests

From ffcff43775d115cec9c6bdca1075febd0b9f8ce8 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 20:05:56 +0100
Subject: [PATCH 19/28] CI: fix builds folder location

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9878719e2..2e166aa8b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Tag docker image
         run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
       - name: Copy contract folder
-        run: mkdir builds && cp -R crates/contract builds/contract
+        run: mkdir builds && cp -R crates/contract /builds/contract
       - name: pre-build compilation cache
         run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests

From 7d32a5e167635f0875a908239b9589f11257921f Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 20:12:59 +0100
Subject: [PATCH 20/28] CI: fix builds folder location

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2e166aa8b..a72c236a1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Tag docker image
         run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
       - name: Copy contract folder
-        run: mkdir builds && cp -R crates/contract /builds/contract
+        run: mkdir /builds && cp -R crates/contract /builds/contract
       - name: pre-build compilation cache
         run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests

From 2139e81e0eff5118b8b27b063047ad9c0863da31 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 20:26:36 +0100
Subject: [PATCH 21/28] fix CI

---
 .github/workflows/rust.yml | 4 ++--
 sysbox/on-start.sh         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a72c236a1..a1bcb2de7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -59,8 +59,8 @@ jobs:
       - name: Tag docker image
         run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
       - name: Copy contract folder
-        run: mkdir /builds && cp -R crates/contract /builds/contract
+        run: mkdir ./builds && cp -R crates/contract ./builds/contract
       - name: pre-build compilation cache
-        run: docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
+        run: docker run --volume cache:/usr/local/cargo/registry --volume ./builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose
diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index 9d818faaa..a20d8117e 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -8,7 +8,7 @@ sleep 2
 docker pull paritytech/ink-ci-linux:production
 docker tag paritytech/ink-ci-linux:production ink-compiler
 
-docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build --release
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist

From 61ae856a4c8c2c189314c11ab3dbb7b47d6e8702 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 20:35:46 +0100
Subject: [PATCH 22/28] build in release mode

---
 .github/workflows/rust.yml          | 2 +-
 crates/sandbox/src/build_command.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a1bcb2de7..8052ba645 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -61,6 +61,6 @@ jobs:
       - name: Copy contract folder
         run: mkdir ./builds && cp -R crates/contract ./builds/contract
       - name: pre-build compilation cache
-        run: docker run --volume cache:/usr/local/cargo/registry --volume ./builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build
+        run: docker run --volume cache:/usr/local/cargo/registry --volume ./builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build --release
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose
diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index 50f900296..c213f0a33 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -135,7 +135,7 @@ fn build_execution_command() -> Vec<String> {
         "rm -rf {}/contract.* {}/metadata.json",
         target_dir, target_dir
     );
-    let build_cmd = "cargo contract build --offline 2>&1".to_string();
+    let build_cmd = "cargo contract build --release --offline 2>&1".to_string();
     let move_cmd = format!("mv {}/contract.contract {}", target_dir, DOCKER_OUTPUT);
 
     let command = format!("{} && {} && {}", clean_cmd, build_cmd, move_cmd);

From 100f8b2289c80fca16ade2e63282563759189a9b Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 20:53:17 +0100
Subject: [PATCH 23/28] CI: absolute path

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8052ba645..5f34049ae 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -61,6 +61,6 @@ jobs:
       - name: Copy contract folder
         run: mkdir ./builds && cp -R crates/contract ./builds/contract
       - name: pre-build compilation cache
-        run: docker run --volume cache:/usr/local/cargo/registry --volume ./builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build --release
+        run: docker run --volume cache:/usr/local/cargo/registry --volume ${GITHUB_WORKSPACE}/builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build --release
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose

From e9be8214284d6435e5995bc9af45e15f24e96693 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 21:16:44 +0100
Subject: [PATCH 24/28] update ink, abs path docker

---
 Cargo.lock                 | 83 ++++++++++++++++++++++++--------------
 Dockerfile                 |  3 +-
 crates/contract/Cargo.toml |  4 +-
 3 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59c7b07ee..0c9e86a76 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -656,7 +656,7 @@ dependencies = [
 
 [[package]]
 name = "contract"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 dependencies = [
  "ink",
  "parity-scale-codec",
@@ -983,6 +983,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "expect-test"
 version = "1.4.0"
@@ -1399,6 +1412,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.13.10"
@@ -1501,9 +1520,9 @@ dependencies = [
 
 [[package]]
 name = "ink"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfc1a216f815f0da881250d7bff100f821d64a2e7ce08b6eccf01c32fbe95d5"
+checksum = "a1b0f5ee16576ec439e45da1f09d24a7933c8c3089c94ec7078f07a82d25c5cf"
 dependencies = [
  "derive_more",
  "ink_env",
@@ -1517,44 +1536,47 @@ dependencies = [
 
 [[package]]
 name = "ink_allocator"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d19e055fdd9ef9fa0dd930d706b4b6f546487d3fcc9d45f6ba08d9d0d7102f3"
+checksum = "b36dadecdc7e33b0fe1c198b52d474ce73ccd93ffd8acd6ded02458b4a58a2d9"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "ink_codegen"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a504663904857ce2ba5e8b85fb5d8001ebff40c327f4cc06b10c2f9b403e0a99"
+checksum = "231c77d70ae53ce602f9f5848e3c1ef3bc9f7ae553a09214ad6e0722f7f99d05"
 dependencies = [
  "blake2",
  "derive_more",
  "either",
+ "env_logger",
  "heck 0.4.0",
  "impl-serde",
  "ink_ir",
  "ink_primitives",
  "itertools",
+ "log",
  "parity-scale-codec",
  "proc-macro2",
  "quote",
+ "serde",
+ "serde_json",
  "syn",
 ]
 
 [[package]]
 name = "ink_engine"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d732c7fef97ab91625125750c73477f0e43cb89b57e57fca4741707c2769871"
+checksum = "319a74f3313698ae6d4ae5b43164a1e0efbfd45bd0f7ef689745f98f6e505998"
 dependencies = [
  "blake2",
  "derive_more",
  "ink_primitives",
  "parity-scale-codec",
- "rand 0.8.4",
  "secp256k1",
  "sha2",
  "sha3",
@@ -1562,9 +1584,9 @@ dependencies = [
 
 [[package]]
 name = "ink_env"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af306608913616b0b69a8293ce03423f057e3293648909ba66061f38e5794f79"
+checksum = "4543d0e0e5d1d97ce1ccb225599603ab15fb9d486f692176649b43a1311a8ad7"
 dependencies = [
  "arrayref",
  "blake2",
@@ -1579,7 +1601,6 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "paste",
- "rand 0.8.4",
  "rlibc",
  "scale-info",
  "secp256k1",
@@ -1590,9 +1611,9 @@ dependencies = [
 
 [[package]]
 name = "ink_ir"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900a7742a319a1fee36172869397e1f6fdf60adbb6a723cd819f0a1874775056"
+checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1"
 dependencies = [
  "blake2",
  "either",
@@ -1604,9 +1625,9 @@ dependencies = [
 
 [[package]]
 name = "ink_macro"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbaaeaa0e16d757eb799c732737fae6d7261e8a9257d5678b75b92a4f8dc516"
+checksum = "4c1e5823e6890d11e839bf1f3e49d81b0f615038d21f7f286344db9749b4994e"
 dependencies = [
  "ink_codegen",
  "ink_ir",
@@ -1620,9 +1641,9 @@ dependencies = [
 
 [[package]]
 name = "ink_metadata"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ae8287f3ae7a9473f1b767db3da834b6875ec7ac4c105ee360a38a5b9d9538"
+checksum = "caa94adad4fca9e3a79a1c5b0edc1ea2109ef56a955a57df35b2ad32c461ac21"
 dependencies = [
  "derive_more",
  "impl-serde",
@@ -1634,18 +1655,18 @@ dependencies = [
 
 [[package]]
 name = "ink_prelude"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd0137ab1536069c7ece025498bc957b02dcaa51460dd2a4402e80521124d04"
+checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "ink_primitives"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433de1b6ff673158ec18b18fc1c149f6e3fa17d76f830256a67292f6fb4bbccf"
+checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9"
 dependencies = [
  "derive_more",
  "ink_prelude",
@@ -1656,9 +1677,9 @@ dependencies = [
 
 [[package]]
 name = "ink_storage"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573363ad95f7dc14c41ed3109ab856419ba02f8c433ae6ca5f1d227494260f6a"
+checksum = "682c664aa58543eafc4e3d4672b7f34c270fb23d69fe41e162e7e0544b946bad"
 dependencies = [
  "array-init",
  "cfg-if 1.0.0",
@@ -1674,9 +1695,9 @@ dependencies = [
 
 [[package]]
 name = "ink_storage_traits"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88aa73c6b8815726674ddc451afa23ec363bc0cafaef81f031e036ff3dfa9506"
+checksum = "596247891eb221a0b7debce9f8cf123b9a14f23a4a10664e73ec16d9eb1e92e9"
 dependencies = [
  "ink_metadata",
  "ink_prelude",
@@ -3303,9 +3324,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.1.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a"
+checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -3317,9 +3338,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.1.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
+checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/Dockerfile b/Dockerfile
index ff535b171..965fc67a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -124,7 +124,8 @@ RUN apt-get --yes install docker-ce docker-ce-cli \
 COPY sysbox/on-start.sh /usr/bin
 RUN chmod +x /usr/bin/on-start.sh
 
-COPY crates/contract builds/contract
+RUN mkdir /builds
+COPY crates/contract /builds/contract
 
 # Entrypoint
 
diff --git a/crates/contract/Cargo.toml b/crates/contract/Cargo.toml
index ba6492cb3..6d0d30ad5 100755
--- a/crates/contract/Cargo.toml
+++ b/crates/contract/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "contract"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.0.0-alpha.3", default-features = false }
+ink = { version = "4.0.0-beta", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }

From 56fc66948a2cd6948296c1734e9719c77bcffa43 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 22:30:04 +0100
Subject: [PATCH 25/28] add cargo clean to docker

---
 sysbox/on-start.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sysbox/on-start.sh b/sysbox/on-start.sh
index a20d8117e..60c6b785f 100755
--- a/sysbox/on-start.sh
+++ b/sysbox/on-start.sh
@@ -8,6 +8,7 @@ sleep 2
 docker pull paritytech/ink-ci-linux:production
 docker tag paritytech/ink-ci-linux:production ink-compiler
 
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo clean
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build --release
 docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test
 # start backend server

From 87ab10e19c2405287e1a3fb77b033154bd8415fb Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Tue, 22 Nov 2022 22:32:07 +0100
Subject: [PATCH 26/28] rust fmt

---
 crates/contract/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/contract/lib.rs b/crates/contract/lib.rs
index a5b7327a3..ccbad9954 100755
--- a/crates/contract/lib.rs
+++ b/crates/contract/lib.rs
@@ -66,4 +66,4 @@ mod flipper {
             assert_eq!(flipper.get(), true);
         }
     }
-}
\ No newline at end of file
+}

From 68fbdd51ecc13a138f150d12ca11faaf009fd070 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Wed, 23 Nov 2022 09:32:31 +0100
Subject: [PATCH 27/28] update contract

---
 crates/contract/Cargo.toml |  9 +++------
 crates/contract/lib.rs     | 31 ++++++++-----------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/crates/contract/Cargo.toml b/crates/contract/Cargo.toml
index 6d0d30ad5..64883121b 100755
--- a/crates/contract/Cargo.toml
+++ b/crates/contract/Cargo.toml
@@ -9,15 +9,12 @@ publish = false
 ink = { version = "4.0.0-beta", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
-scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
-name = "contract"
+name = "flipper"
 path = "lib.rs"
-crate-type = [
-        # Used for normal contract Wasm blobs.
-        "cdylib",
-]
+crate-type = ["cdylib"]
 
 [features]
 default = ["std"]
diff --git a/crates/contract/lib.rs b/crates/contract/lib.rs
index ccbad9954..58f191054 100755
--- a/crates/contract/lib.rs
+++ b/crates/contract/lib.rs
@@ -1,69 +1,54 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[ink::contract]
-mod flipper {
-
-    /// Defines the storage of your contract.
-    /// Add new fields to the below struct in order
-    /// to add new static storage fields to your contract.
+pub mod flipper {
     #[ink(storage)]
     pub struct Flipper {
-        /// Stores a single `bool` value on the storage.
         value: bool,
     }
 
     impl Flipper {
-        /// Constructor that initializes the `bool` value to the given `init_value`.
+        /// Creates a new flipper smart contract initialized with the given value.
         #[ink(constructor)]
         pub fn new(init_value: bool) -> Self {
             Self { value: init_value }
         }
 
-        /// Constructor that initializes the `bool` value to `false`.
-        ///
-        /// Constructors can delegate to other constructors.
+        /// Creates a new flipper smart contract initialized to `false`.
         #[ink(constructor)]
         pub fn default() -> Self {
             Self::new(Default::default())
         }
 
-        /// A message that can be called on instantiated contracts.
-        /// This one flips the value of the stored `bool` from `true`
-        /// to `false` and vice versa.
+        /// Flips the current value of the Flipper's boolean.
         #[ink(message)]
         pub fn flip(&mut self) {
             self.value = !self.value;
         }
 
-        /// Simply returns the current value of our `bool`.
+        /// Returns the current value of the Flipper's boolean.
         #[ink(message)]
         pub fn get(&self) -> bool {
             self.value
         }
     }
 
-    /// Unit tests in Rust are normally defined within such a `#[cfg(test)]`
-    /// module and test functions are marked with a `#[test]` attribute.
-    /// The below code is technically just normal Rust code.
     #[cfg(test)]
     mod tests {
-        /// Imports all the definitions from the outer scope so we can use them here.
         use super::*;
 
-        /// We test if the default constructor does its job.
         #[ink::test]
         fn default_works() {
             let flipper = Flipper::default();
-            assert_eq!(flipper.get(), false);
+            assert!(!flipper.get());
         }
 
-        /// We test a simple use case of our contract.
         #[ink::test]
         fn it_works() {
             let mut flipper = Flipper::new(false);
-            assert_eq!(flipper.get(), false);
+            assert!(!flipper.get());
             flipper.flip();
-            assert_eq!(flipper.get(), true);
+            assert!(flipper.get());
         }
     }
 }

From 5b82f902cdeb2783fb8006a9e7ecf0e6243dd4c1 Mon Sep 17 00:00:00 2001
From: Achim Schneider <achim.schneider@posteo.de>
Date: Wed, 23 Nov 2022 12:50:33 +0100
Subject: [PATCH 28/28] fix contract name

---
 crates/contract/Cargo.toml          | 2 +-
 crates/sandbox/src/build_command.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/contract/Cargo.toml b/crates/contract/Cargo.toml
index 64883121b..ddf28607c 100755
--- a/crates/contract/Cargo.toml
+++ b/crates/contract/Cargo.toml
@@ -12,7 +12,7 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals
 scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
-name = "flipper"
+name = "contract"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
index c213f0a33..c5c614ab5 100644
--- a/crates/sandbox/src/build_command.rs
+++ b/crates/sandbox/src/build_command.rs
@@ -107,7 +107,7 @@ fn build_basic_secure_docker_command() -> Command {
         "--volume",
         "cache:/usr/local/cargo/registry:ro",
         "--volume",
-        "/builds/contract/Cargo.toml:/builds/contract/Cargo.toml",
+        "/builds:/builds",
         "--memory",
         "1024m",
         "--memory-swap",