Fix broken paths

.dockerignore

@@ -8,8 +8,6 @@
 !Cargo.lock
 !Cargo.toml
 !contracts/build
-!js/client/index.html
-!js/client/dist
-!js/explorer/index.html
-!js/explorer/dist
-!js/fee-seller
+!infrastructure/explorer/index.html
+!infrastructure/explorer/dist
+!infrastructure/fee-seller

.github/CODEOWNERS

@@ -2,20 +2,18 @@
 # https://help.github.com/articles/about-codeowners/
 
 # notify about changes in codeowners file
-/.github/       @dvush
+/.github/       @dvush @pozpxc
 
 # notify about any circuit, prover and server changes
-/core/circuit/ @alexander-movchan @gluk64
+/core/circuit/ @alexander-movchan
 /core @dvush @popzxc
 
 # dev tools
-/bin @dvush
-/Makefile @dvush
-/.drone.yml @dvush
+/bin @dvush @popzxc
+/Makefile @dvush @popzxc
 
 # js
-/js/zksync.js @dvush
-/js/tests @dvush
+/infrastructure/ @dvush @popzxc
 
 # notify dvush about contracts changes
-/contracts/     @dvush @gluk64
+/contracts/     @dvush @popzxc

.github/workflows/ci.yml

@@ -59,7 +59,7 @@ jobs:
       run: f cargo test --release
 
     - name: zksync-crypto-tests
-      run: pushd js/zksync-crypto && f cargo test --release
+      run: pushd sdk/zksync-crypto && f cargo test --release
 
     - name: db-tests
       run: zksync db-test
@@ -71,7 +71,7 @@ jobs:
       run: zksync circuit-tests "" `nproc`
 
     - name: update-selfhosted-cache
-      run: tar cf ~/runner-cache.tar keys/setup target js/zksync-crypto/target
+      run: tar cf ~/runner-cache.tar keys/setup target sdk/zksync-crypto/target
 
     services:
       geth:

.gitignore

@@ -20,7 +20,7 @@ npm-debug.log
 
 Cargo.lock
 !/Cargo.lock
-!/js/zksync-crypto/Cargo.lock
+!/infrastructure/zksync-crypto/Cargo.lock
 
 /etc/env/*
 !/etc/env/dev.env.example

Makefile

@@ -27,11 +27,12 @@ init:
 yarn:
 	@cd sdk/zksync-crypto
 	@cd sdk/zksync.js && yarn && yarn build
-	@cd infrastructure/explorer && yarn
 	@cd contracts && yarn
 	@cd core/tests/ts-tests && yarn
-	@cd js/fee-seller && yarn
+	@cd infrastructure/explorer && yarn
+	@cd infrastructure/fee-seller && yarn
 	@cd infrastructure/zcli && yarn
+	@cd infrastructure/analytics && yarn
 
 
 # Helpers
@@ -84,17 +85,11 @@ genesis: confirm_action db-reset
 
 # Frontend clients
 
-client:
-	@cd js/client && yarn serve
-
 explorer:
-	@cd js/explorer && yarn serve
-
-dist-client: yarn build-contracts
-	@cd js/client && yarn build
+	@cd infrastructure/explorer && yarn serve
 
 dist-explorer: yarn build-contracts
-	@cd js/explorer && yarn build
+	@cd infrastructure/explorer && yarn build
 
 image-nginx: dist-client dist-explorer
 	@docker build -t "${NGINX_DOCKER_IMAGE}" -t "${NGINX_DOCKER_IMAGE_LATEST}" -f ./docker/nginx/Dockerfile .
@@ -190,8 +185,8 @@ prover-tests:
 	f cargo test -p prover --release -- --ignored
 
 js-tests:
-	@cd js/zksync.js && yarn tests
-	@cd js/fee-seller && yarn tests
+	@cd sdk/zksync.js && yarn tests
+	@cd infrastructure/fee-seller && yarn tests
 
 # Devops: main
 

docker/fee-seller/Dockerfile

@@ -1,10 +1,10 @@
 FROM node:12
 WORKDIR /usr/src/fee-seller
-COPY js/fee-seller/package.json .
-COPY js/fee-seller/yarn.lock .
+COPY infrastructure/fee-seller/package.json .
+COPY infrastructure/fee-seller/yarn.lock .
 RUN yarn install --frozen-lockfile
 
-COPY js/fee-seller/ .
+COPY infrastructure/fee-seller/ .
 
 # required env
 # ENV FEE_ACCOUNT_PRIVATE_KEY

infrastructure/analytics/yarn.lock

@@ -1668,6 +1668,6 @@ zksync-crypto@^0.3.1:
   resolved "https://registry.yarnpkg.com/zksync-crypto/-/zksync-crypto-0.3.2.tgz#2e073d1c42a09f65efe41119e3e065edff87fb95"
   integrity sha512-fLNZ82wddyevNe9O6WEB0Ls3DnttkJH5s7E1tXXq9mGHMVSn/oMHFn35BD6ZRBhALdLexKbalWoJ89Ua93yzFg==
 
-"zksync@link:../../js/zksync.js":
+"zksync@link:../../sdk/zksync.js":
   version "0.0.0"
   uid ""