Fix docker usage in contract deploy

Author: obrok

.github/scripts/run_e2e_test.sh

@@ -113,7 +113,7 @@ fi
 
 if [[ -n "${ADDER:-}" ]]; then
     ARGS+=(-e "ADDER=${ADDER}")
-    ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/metadata.json")
+    ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/adder.json")
 fi
 
 if [[ -n "${BUTTON_GAME_METADATA:-}" ]]; then
@@ -123,12 +123,12 @@ if [[ -n "${BUTTON_GAME_METADATA:-}" ]]; then
     ARGS+=(-e "SIMPLE_DEX=${SIMPLE_DEX}")
     ARGS+=(-e "WRAPPED_AZERO=${WRAPPED_AZERO}")
     ARGS+=(-e "RUST_LOG=${RUST_LOG}")
-    ARGS+=(-e "BUTTON_GAME_METADATA=/contracts/button/target/ink/metadata.json")
-    ARGS+=(-e "TICKET_TOKEN_METADATA=/contracts/ticket_token/target/ink/metadata.json")
-    ARGS+=(-e "REWARD_TOKEN_METADATA=/contracts/game_token/target/ink/metadata.json")
-    ARGS+=(-e "MARKETPLACE_METADATA=/contracts/marketplace/target/ink/metadata.json")
-    ARGS+=(-e "SIMPLE_DEX_METADATA=/contracts/simple_dex/target/ink/metadata.json")
-    ARGS+=(-e "WRAPPED_AZERO_METADATA=/contracts/wrapped_azero/target/ink/metadata.json")
+    ARGS+=(-e "BUTTON_GAME_METADATA=/contracts/button/target/ink/button.json")
+    ARGS+=(-e "TICKET_TOKEN_METADATA=/contracts/ticket_token/target/ink/ticket_token.json")
+    ARGS+=(-e "REWARD_TOKEN_METADATA=/contracts/game_token/target/ink/game_token.json")
+    ARGS+=(-e "MARKETPLACE_METADATA=/contracts/marketplace/target/ink/marketplace.json")
+    ARGS+=(-e "SIMPLE_DEX_METADATA=/contracts/simple_dex/target/ink/simple_dex.json")
+    ARGS+=(-e "WRAPPED_AZERO_METADATA=/contracts/wrapped_azero/target/ink/wrapped_azero.json")
 fi
 
 if [[ -n "${OUT_LATENCY:-}" ]]; then

.github/workflows/e2e-tests-main-devnet.yml

@@ -533,10 +533,6 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v2
 
-      - name: Install rust-src
-        working-directory: ./contracts
-        run: rustup component add rust-src
-
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
@@ -552,13 +548,6 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v2
 
-      - name: Install cargo-contract
-        run: cargo install cargo-contract --version 2.0.1
-
-      - name: Install rust-src
-        working-directory: ./contracts
-        run: rustup component add rust-src
-
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:

contracts/adder/deploy.sh

@@ -1,24 +1,37 @@
 #!/bin/bash
 
-set -euo pipefail
+set -euox pipefail
 
 NODE_URL="${NODE_URL:-ws://localhost:9944}"
 AUTHORITY="${AUTHORITY:-//Alice}"
 
-function ink-build() {
-  docker run \
+function run_ink_builder() {
+  docker start ink_builder 1>&2 || docker run \
     --network host \
-    -v ${PWD}:/code \
+    -v "${PWD}/../..:/code" \
+    -u "$(id -u):$(id -g)" \
+    --name ink_builder \
     --platform linux/amd64 \
-    --rm public.ecr.aws/p6e8q1z1/ink-dev:0.1.0 "$@"
+    --detach \
+    --rm public.ecr.aws/p6e8q1z1/ink-dev:1.0.0 sleep 1d 1>&2
 }
 
-ink-build cargo contract build --release --quiet 1>&2
+function ink_build() {
+  docker exec \
+    -u "$(id -u):$(id -g)" \
+    -w "/code/contracts/adder" \
+    ink_builder "$@"
+}
+
+run_ink_builder
+ink_build rustup target add wasm32-unknown-unknown
+ink_build rustup component add rust-src
+ink_build cargo contract build --release --quiet 1>&2
 
 export ADDER
 
 ADDER=$(
-  ink-build cargo contract instantiate --url "$NODE_URL" --suri "$AUTHORITY" --skip-confirm --output-json \
+  ink_build cargo contract instantiate --url "$NODE_URL" --suri "$AUTHORITY" --skip-confirm --output-json \
     | jq -r ".contract"
 )
 echo "$ADDER"

contracts/scripts/deploy.sh

@@ -1,16 +1,31 @@
 #!/bin/bash
 
-set -euo pipefail
+set -euox pipefail
 
 # --- FUNCTIONS
 
+function run_ink_builder() {
+  docker start ink_builder || docker run \
+    --network host \
+    -v "${PWD}:/code" \
+    -u "$(id -u):$(id -g)" \
+    --name ink_builder \
+    --platform linux/amd64 \
+    --detach \
+    --rm public.ecr.aws/p6e8q1z1/ink-dev:1.0.0 sleep 1d
+}
+
+function ink_build() {
+  contract_dir=$(basename "${PWD}")
+
+  docker exec \
+    -u "$(id -u):$(id -g)" \
+    -w "/code/contracts/$contract_dir" \
+    ink_builder "$@"
+}
+
 function cargo_contract() {
-    docker run \
-      -v "${PWD}:/code" \
-      --platform linux/amd64 \
-      --rm -it cardinal-cryptography/ink-dev:latest \
-      --network host \
-      cargo contract "$@"
+  ink_build cargo contract "$@"
 }
 
 function upload_contract {
@@ -234,7 +249,11 @@ CONTRACTS_PATH=$(pwd)/contracts
 
 # --- COMPILE CONTRACTS
 
+run_ink_builder
+
 cd "$CONTRACTS_PATH"/access_control
+ink_build rustup target add wasm32-unknown-unknown
+ink_build rustup component add rust-src
 cargo_contract build --release
 
 cd "$CONTRACTS_PATH"/ticket_token

docker/common.yml

@@ -7,7 +7,7 @@ services:
       - CHAIN=/data/chainspec.json
       - ALLOW_PRIVATE_IPV4=true
       - DISCOVER_LOCAL=true
-      - UNIT_CREATION_DELAY=50
+      - UNIT_CREATION_DELAY=300
     volumes:
       - ./data/:/data/