Merge remote-tracking branch 'origin/dev' into deniallugo-zks-202-ens…

…ure-that-fee-ticker-can-work-even-if
huynhvantoanbsbc · Dec 22, 2020 · 4efd5af · 4efd5af
2 parents 2a73077 + e805c5d
commit 4efd5af
Show file tree

Hide file tree

Showing 138 changed files with 4,332 additions and 1,726 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,10 +42,9 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: update-deps
-      # Upstream version of sqlx-cli has some incompatibilities with the sqlx version used zksync_storage.
       run: |
         rustup update stable
-        cargo install sqlx-cli --git https://github.com/alekseysidorov/sqlx.git
+        cargo install --version=0.2.0 sqlx-cli
         cargo install diesel_cli --no-default-features --features postgres
         docker pull matterlabs/ci-integration-test:zk-latest
 

diff --git a/.github/workflows/promote-stage.yml b/.github/workflows/promote-stage.yml
@@ -21,7 +21,7 @@ jobs:
 
     - name: init
       run: |
-        cargo sqlx --version || cargo install --version=0.1.0-beta.1 sqlx-cli
+        cargo sqlx --version || cargo install --version=0.2.0 sqlx-cli
         zk
         zk run yarn
         cp etc/tokens/{test,localhost}.json

diff --git a/.prettier-js.json b/.prettier-js.json
@@ -0,0 +1,7 @@
+{
+    "tabWidth": 4,
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": true
+}
diff --git a/.prettier-vue.json b/.prettier-vue.json
@@ -0,0 +1,7 @@
+{
+    "tabWidth": 4,
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": true
+}