Merge branch 'dvush-new-sc' of ssh://tr:/home/dvush/code/zksync-dev i…

…nto dvush-new-sc
zinderud · Dec 11, 2020 · 3031cd0 · 3031cd0
2 parents 3e9ed36 + 6573616
commit 3031cd0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -13,7 +13,7 @@
 !package.json
 !Cargo.lock
 !Cargo.toml
-!contracts/build
+!contracts/artifacts
 !infrastructure/explorer/index.html
 !infrastructure/explorer/dist
 !infrastructure/fee-seller

diff --git a/docker/prover/Dockerfile b/docker/prover/Dockerfile
@@ -31,6 +31,6 @@ COPY --from=builder /usr/src/zksync/target/release/plonk_step_by_step_prover /bi
 COPY --from=builder /usr/src/zksync/target/release/dummy_prover /bin/
 COPY docker/prover/prover-entry.sh /bin/
 COPY keys/packed /keys/packed
-COPY contracts/build /contracts/build
+COPY contracts/artifacts/ /contracts/artifacts/
 
 CMD ["prover-entry.sh"]
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
@@ -11,5 +11,5 @@ EXPOSE 3000
 EXPOSE 3031
 EXPOSE 3030
 COPY --from=builder /usr/src/zksync/target/release/zksync_server /usr/bin
-COPY contracts/build/ /contracts/build/
+COPY contracts/artifacts/ /contracts/artifacts/
 ENTRYPOINT ["zksync_server"]
diff --git a/infrastructure/zk/src/kube.ts b/infrastructure/zk/src/kube.ts
@@ -11,7 +11,7 @@ export async function updateConfig() {
         namespace = 'dev';
     } else if (env == 'prod') {
         namespace = 'zksync';
-    } else if (['stage', 'rinkeby', 'ropsten', 'breaking'].includes(env)) {
+    } else if (['stage', 'rinkeby', 'ropsten', 'breaking', 'rinkeby-beta', 'rospten-beta'].includes(env)) {
         namespace = env;
     } else {
         console.error('Unknown environment');