From 1ea300be0f5d2153f28a479063227c93c7345097 Mon Sep 17 00:00:00 2001
From: Levent DEMIR <levent.demir@zama.ai>
Date: Fri, 30 Jun 2023 15:51:50 +0200
Subject: [PATCH] Ci/fix keys for staging env deployment + bump evmos-node
 image version (#159)

* ci(deploy): fix path to keys in s3 bucket (add version in folder name)

* ci: use v0.1.15 for evmos node image
---
 .github/workflows/deploy_validator_aws.yml  | 2 +-
 Makefile                                    | 2 +-
 docker-compose/docker-compose.validator.yml | 2 +-
 scripts/prepare_volumes_validator_ci.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy_validator_aws.yml b/.github/workflows/deploy_validator_aws.yml
index 5b764f0c..38bc5def 100644
--- a/.github/workflows/deploy_validator_aws.yml
+++ b/.github/workflows/deploy_validator_aws.yml
@@ -150,7 +150,7 @@ jobs:
 
       - name: Sleep for 3 seconds to ensure validtor is running
         run: |
-          sleep 5s
+          sleep 10s
           
       - name: List files in zbc-solidity
         working-directory: evmos/work_dir/zbc-solidity
diff --git a/Makefile b/Makefile
index 7964c2c9..38360a2f 100755
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ ZBC_ORACLE_DB_VERSION ?= main
 
 ZBC_SOLIDITY_PATH ?= $(WORKDIR)/zbc-solidity
 ZBC_SOLIDITY_PATH_EXISTS := $(shell test -d $(ZBC_SOLIDITY_PATH)/.git && echo "true" || echo "false")
-ZBC_SOLIDITY_VERSION ?= v0.1.2
+ZBC_SOLIDITY_VERSION ?= v0.1.3-beta
 
 ETHERMINT_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/ethermint)
 GO_ETHEREUM_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/go-ethereum)
diff --git a/docker-compose/docker-compose.validator.yml b/docker-compose/docker-compose.validator.yml
index 60146a2a..ddd9f06c 100644
--- a/docker-compose/docker-compose.validator.yml
+++ b/docker-compose/docker-compose.validator.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   validator:
-    image: ghcr.io/zama-ai/evmos-node:v0.1.3
+    image: ghcr.io/zama-ai/evmos-node:v0.1.5
     container_name: evmosnode0
     ports:
       - "26656-26657:26656-26657"
diff --git a/scripts/prepare_volumes_validator_ci.sh b/scripts/prepare_volumes_validator_ci.sh
index 069ae218..e0b6c17c 100755
--- a/scripts/prepare_volumes_validator_ci.sh
+++ b/scripts/prepare_volumes_validator_ci.sh
@@ -6,7 +6,7 @@ NETWORK_KEYS_PUBLIC_PATH=./volumes/network-public-fhe-keys
 NETWORK_KEYS_PRIVATE_PATH=./volumes/network-private-fhe-keys
 S3_BUCKET_PATH="s3://zbc-testnet"
 S3_NETWORK_KEYS_PATH="$S3_BUCKET_PATH/network-fhe-keys"
-S3_NETWORK_KEYS_FULL_PATH="$S3_NETWORK_KEYS_PATH/staging-env"
+S3_NETWORK_KEYS_FULL_PATH="$S3_NETWORK_KEYS_PATH/keys_gen_with_zbc_fhe_tool_v0_1_1"
 
 mkdir -p $NETWORK_KEYS_PUBLIC_PATH
 mkdir -p $NETWORK_KEYS_PRIVATE_PATH