Add infrastructure folder

MuxinFeng · Sep 16, 2020 · e2b6687 · e2b6687
1 parent db50a70
commit e2b6687
Show file tree

Hide file tree

Showing 48 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
     "core/bin/key_generator",
     "core/bin/server",
     "core/bin/prover",
-    "core/bin/tok_cli",
 
     "core/lib/circuit",
     "core/lib/crypto_exports",
@@ -16,4 +15,6 @@ members = [
 
     "core/tests/testkit",
     "core/tests/loadtest",
+
+    "infrastructure/tok_cli",
 ]
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -66,7 +66,9 @@ This section provides an overview on folders / sub-projects that exist in this r
   - `/js`: Configuration files for JavaScript applications (such as Explorer).
   - `/tesseracts`: Configuration for `tesseracts` minimalistic blockchain explorer (used for development).
   - `/tokens`: Configuration of supported Ethereum ERC-20 tokens.
-- `/explorer`: A blockchain explorer for zkSync network.
+- `/infrastructure`: Application that aren't naturally a part of zkSync core, but are related to it.
+  - `/explorer`: A blockchain explorer for zkSync network.
+  - `/tok_cli`: A command-line utility for adding new supported tokens into zkSync
 - `/keys`: Verification keys for `circuit` module.
 - `/sdk`: Implementation of client libraries for zkSync network in different programming languages.
   - `/zksync-crypto`: zkSync network cryptographic primitives, which can be compiled to WASM.

diff --git a/explorer/.browserslistrc → infrastructure/explorer/.browserslistrc b/explorer/.browserslistrc → infrastructure/explorer/.browserslistrc
diff --git a/explorer/.eslintrc.js → infrastructure/explorer/.eslintrc.js b/explorer/.eslintrc.js → infrastructure/explorer/.eslintrc.js
diff --git a/explorer/.gitignore → infrastructure/explorer/.gitignore b/explorer/.gitignore → infrastructure/explorer/.gitignore
diff --git a/explorer/README.md → infrastructure/explorer/README.md b/explorer/README.md → infrastructure/explorer/README.md
diff --git a/explorer/babel.config.js → infrastructure/explorer/babel.config.js b/explorer/babel.config.js → infrastructure/explorer/babel.config.js
diff --git a/explorer/package.json → infrastructure/explorer/package.json b/explorer/package.json → infrastructure/explorer/package.json
@@ -20,7 +20,7 @@
     "vue": "^2.6.10",
     "vue-router": "^3.1.3",
     "vue-timers": "^2.0.4",
-    "zksync": "link:../sdk/zksync.js"
+    "zksync": "link:../../sdk/zksync.js"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.0",

diff --git a/explorer/postcss.config.js → infrastructure/explorer/postcss.config.js b/explorer/postcss.config.js → infrastructure/explorer/postcss.config.js
diff --git a/explorer/public/favicon.png → infrastructure/explorer/public/favicon.png b/explorer/public/favicon.png → infrastructure/explorer/public/favicon.png
diff --git a/explorer/public/index.html → infrastructure/explorer/public/index.html b/explorer/public/index.html → infrastructure/explorer/public/index.html
diff --git a/explorer/src/Account.vue → infrastructure/explorer/src/Account.vue b/explorer/src/Account.vue → infrastructure/explorer/src/Account.vue
diff --git a/explorer/src/App.vue → infrastructure/explorer/src/App.vue b/explorer/src/App.vue → infrastructure/explorer/src/App.vue
diff --git a/explorer/src/Block.vue → infrastructure/explorer/src/Block.vue b/explorer/src/Block.vue → infrastructure/explorer/src/Block.vue
diff --git a/explorer/src/BlockExplorerClient.js → ...cture/explorer/src/BlockExplorerClient.js b/explorer/src/BlockExplorerClient.js → ...cture/explorer/src/BlockExplorerClient.js
diff --git a/explorer/src/Client.js → infrastructure/explorer/src/Client.js b/explorer/src/Client.js → infrastructure/explorer/src/Client.js
diff --git a/explorer/src/ClosableJumbotron.vue → ...ucture/explorer/src/ClosableJumbotron.vue b/explorer/src/ClosableJumbotron.vue → ...ucture/explorer/src/ClosableJumbotron.vue
diff --git a/explorer/src/CopyableAddress.vue → ...tructure/explorer/src/CopyableAddress.vue b/explorer/src/CopyableAddress.vue → ...tructure/explorer/src/CopyableAddress.vue
diff --git a/explorer/src/Home.vue → infrastructure/explorer/src/Home.vue b/explorer/src/Home.vue → infrastructure/explorer/src/Home.vue
diff --git a/explorer/src/Navbar.vue → infrastructure/explorer/src/Navbar.vue b/explorer/src/Navbar.vue → infrastructure/explorer/src/Navbar.vue
diff --git a/explorer/src/Question.vue → infrastructure/explorer/src/Question.vue b/explorer/src/Question.vue → infrastructure/explorer/src/Question.vue
diff --git a/explorer/src/ReadinessStatus.vue → ...tructure/explorer/src/ReadinessStatus.vue b/explorer/src/ReadinessStatus.vue → ...tructure/explorer/src/ReadinessStatus.vue
diff --git a/explorer/src/SearchField.vue → infrastructure/explorer/src/SearchField.vue b/explorer/src/SearchField.vue → infrastructure/explorer/src/SearchField.vue
diff --git a/explorer/src/Tokens.vue → infrastructure/explorer/src/Tokens.vue b/explorer/src/Tokens.vue → infrastructure/explorer/src/Tokens.vue
diff --git a/explorer/src/Transaction.vue → infrastructure/explorer/src/Transaction.vue b/explorer/src/Transaction.vue → infrastructure/explorer/src/Transaction.vue
diff --git a/explorer/src/TransactionList.vue → ...tructure/explorer/src/TransactionList.vue b/explorer/src/TransactionList.vue → ...tructure/explorer/src/TransactionList.vue
diff --git a/explorer/src/assets/1.svg → infrastructure/explorer/src/assets/1.svg b/explorer/src/assets/1.svg → infrastructure/explorer/src/assets/1.svg
diff --git a/explorer/src/assets/2.svg → infrastructure/explorer/src/assets/2.svg b/explorer/src/assets/2.svg → infrastructure/explorer/src/assets/2.svg
diff --git a/explorer/src/assets/ZK_dark.svg → ...structure/explorer/src/assets/ZK_dark.svg b/explorer/src/assets/ZK_dark.svg → ...structure/explorer/src/assets/ZK_dark.svg
diff --git a/explorer/src/assets/cross.png → infrastructure/explorer/src/assets/cross.png b/explorer/src/assets/cross.png → infrastructure/explorer/src/assets/cross.png
diff --git a/explorer/src/assets/loading.gif → ...structure/explorer/src/assets/loading.gif b/explorer/src/assets/loading.gif → ...structure/explorer/src/assets/loading.gif
diff --git a/explorer/src/assets/logo.jpg → infrastructure/explorer/src/assets/logo.jpg b/explorer/src/assets/logo.jpg → infrastructure/explorer/src/assets/logo.jpg
diff --git a/explorer/src/assets/logo0.png → infrastructure/explorer/src/assets/logo0.png b/explorer/src/assets/logo0.png → infrastructure/explorer/src/assets/logo0.png
diff --git a/explorer/src/assets/logo_text_dark.svg → ...re/explorer/src/assets/logo_text_dark.svg b/explorer/src/assets/logo_text_dark.svg → ...re/explorer/src/assets/logo_text_dark.svg
diff --git a/explorer/src/constants.js → infrastructure/explorer/src/constants.js b/explorer/src/constants.js → infrastructure/explorer/src/constants.js
diff --git a/explorer/src/main.js → infrastructure/explorer/src/main.js b/explorer/src/main.js → infrastructure/explorer/src/main.js
diff --git a/explorer/src/store.js → infrastructure/explorer/src/store.js b/explorer/src/store.js → infrastructure/explorer/src/store.js
diff --git a/explorer/src/style.css → infrastructure/explorer/src/style.css b/explorer/src/style.css → infrastructure/explorer/src/style.css
diff --git a/explorer/src/timeConstants.js → infrastructure/explorer/src/timeConstants.js b/explorer/src/timeConstants.js → infrastructure/explorer/src/timeConstants.js
diff --git a/explorer/src/utils.js → infrastructure/explorer/src/utils.js b/explorer/src/utils.js → infrastructure/explorer/src/utils.js
diff --git a/explorer/vue.config.js → infrastructure/explorer/vue.config.js b/explorer/vue.config.js → infrastructure/explorer/vue.config.js
diff --git a/explorer/yarn.lock → infrastructure/explorer/yarn.lock b/explorer/yarn.lock → infrastructure/explorer/yarn.lock
diff --git a/core/bin/tok_cli/Cargo.toml → infrastructure/tok_cli/Cargo.toml b/core/bin/tok_cli/Cargo.toml → infrastructure/tok_cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vlad Bochok <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-models = { path = "../../lib/models", version = "0.0.1" }
+models = { path = "../../core/lib/models", version = "0.0.1" }
 
 anyhow = "1.0"
 tokio = { version = "0.2", features = ["full"] }

diff --git a/core/bin/tok_cli/erc20.json → infrastructure/tok_cli/erc20.json b/core/bin/tok_cli/erc20.json → infrastructure/tok_cli/erc20.json
diff --git a/core/bin/tok_cli/src/cli.rs → infrastructure/tok_cli/src/cli.rs b/core/bin/tok_cli/src/cli.rs → infrastructure/tok_cli/src/cli.rs
diff --git a/core/bin/tok_cli/src/main.rs → infrastructure/tok_cli/src/main.rs b/core/bin/tok_cli/src/main.rs → infrastructure/tok_cli/src/main.rs
diff --git a/core/bin/tok_cli/src/token.rs → infrastructure/tok_cli/src/token.rs b/core/bin/tok_cli/src/token.rs → infrastructure/tok_cli/src/token.rs
diff --git a/core/bin/tok_cli/src/utils.rs → infrastructure/tok_cli/src/utils.rs b/core/bin/tok_cli/src/utils.rs → infrastructure/tok_cli/src/utils.rs