Merge branch 'dev' into cli-token-tool

jingkai1 · Sep 4, 2020 · 14f6b10 · 14f6b10
2 parents c29ff25 + 78d0131
commit 14f6b10
Show file tree

Hide file tree

Showing 42 changed files with 3,089 additions and 3,390 deletions.
diff --git a/.github/workflows/promote-stage.yml b/.github/workflows/promote-stage.yml
@@ -27,13 +27,13 @@ jobs:
       run: |
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
         zksync update-images
-        echo "::set-env name=IMAGE_TAG::$(f sh -c 'echo $IMAGE_TAG')"
+        echo "::set-env name=IMAGE_TAG::$(git rev-parse --short HEAD)"
 
     - name: promote-to-gitlab
       run: |
         curl -X POST \
          -F token=${{ secrets.GITLAB_TOKEN }} \
-         -F "ref=gitlab-deploy" \
+         -F "ref=master" \
          -F "variables[SERVER_TAG]=$IMAGE_TAG" \
          -F "variables[PROVER_TAG]=$IMAGE_TAG" \
          -F "variables[EXPLORER_TAG]=$IMAGE_TAG" \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # zkSync changelog
 
+### zksync.js 0.6.5
+
+- Support of fast withdrawals was added. Corresponding optional field was added to the object passed to the `withdrawFromSyncToEthereum` method
+  and `getTransactionFee` now accepts `FastWithdraw` fee type.
+
 ### zksync.js 0.6.3
 
 - Bundled version for browsers added. File `dist/main.js` can be used in `<script>` html tag.

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export CI_PIPELINE_ID ?= $(shell date +"%Y-%m-%d-%s")
+export IMAGE_TAG = $(shell git rev-parse --short HEAD)
 export SERVER_DOCKER_IMAGE ?=matterlabs/server:$(IMAGE_TAG)
 export SERVER_DOCKER_IMAGE_LATEST ?=matterlabs/server:latest
 export PROVER_DOCKER_IMAGE ?=matterlabs/prover:$(IMAGE_TAG)

diff --git a/bin/cluster-ip b/bin/cluster-ip
diff --git a/bin/dc b/bin/dc
diff --git a/bin/do-clusters b/bin/do-clusters
diff --git a/bin/do-configure b/bin/do-configure
diff --git a/bin/do-create b/bin/do-create
diff --git a/bin/do-create-prover b/bin/do-create-prover
diff --git a/bin/do-curl b/bin/do-curl
diff --git a/bin/do-destory b/bin/do-destory
diff --git a/bin/do-loadbalancers b/bin/do-loadbalancers
diff --git a/bin/do-main-id b/bin/do-main-id
diff --git a/bin/do-scale-single b/bin/do-scale-single
diff --git a/bin/do-sizes b/bin/do-sizes
diff --git a/bin/k8s-apply b/bin/k8s-apply
diff --git a/bin/k8s-configmap b/bin/k8s-configmap
diff --git a/bin/k8s-gen-resource-definitions b/bin/k8s-gen-resource-definitions
diff --git a/bin/k8s-server-env-cm-from-env b/bin/k8s-server-env-cm-from-env
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+USAGE='Usage: zksync k8s-server-env-cm-from-env
+
+Used to generate server-env-custom configmap in the k8s cluster from etc/env file.
+'
+
+. .setup_env
+
+set -e
+
+echo "Update server-env-custom configmap for zskync env: $ZKSYNC_ENV"
+
+update_configmap() {
+  kubectl delete configmap server-env-custom -n $1
+  kubectl create configmap server-env-custom --from-env-file=etc/env/$ZKSYNC_ENV.env -n $1
+}
+
+case $ZKSYNC_ENV in
+    dev)
+        echo "This command requires environment with k8s cluster" && exit 1
+        ;;
+    development)
+        update_configmap dev
+        ;;
+    prod)
+        update_configmap zksync
+        ;;
+    stage | rinkeby | ropsten | breaking)
+        update_configmap $ZKSYNC_ENV
+        ;;
+    -h|--h)
+        echo "$USAGE" && exit 0
+        ;;
+    *)
+        echo "$USAGE" && exit 1
+        ;;
+esac
diff --git a/bin/kube b/bin/kube
diff --git a/bin/kube-update-server-vars b/bin/kube-update-server-vars
diff --git a/bin/promote-to.sh b/bin/promote-to.sh
diff --git a/bin/provers-patch-deployments b/bin/provers-patch-deployments
diff --git a/bin/restart-kube b/bin/restart-kube