feat: docker-compose.yml for testing

closes #14

.package-dev.json

@@ -0,0 +1,9 @@
+{
+  "name": "zkopru",
+  "version": "0.0.1",
+  "license": "GPL-3.0-or-later",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ]
+}

Makefile

@@ -27,6 +27,7 @@ coordinator-container:
 
 # ------------ Pull containers fro docker hub ------------- #
 pull-dev-images:
-	@docker pull wanseob/zkopru-contract
-	@docker pull wanseob/zkopru-circuits
-	@docker pull wanseob/zkopru-circuits-test
+	@docker pull wanseob/zkopru-contract:0.0.1
+	@docker pull wanseob/zkopru-contract-integration-test:0.0.1
+	@docker pull wanseob/zkopru-circuits:0.0.1
+	@docker pull wanseob/zkopru-circuits-test:0.0.1

containers/Coordinator.dockerfile

@@ -3,43 +3,38 @@ RUN apk add --no-cache --virtual .gyp \
         python \
         make \
         g++ \
-    && npm install -g truffle ganache-cli \
+    && npm install  -g node-gyp-build \
     && apk del .gyp
-WORKDIR /packages
+RUN npm install -g lerna
+WORKDIR /proj
 
 # Copy package.json
-COPY ./packages/account/package.json /packages/account/package.json
-COPY ./packages/babyjubjub/package.json /packages/babyjubjub/package.json
-COPY ./packages/contracts/package.json /packages/contracts/package.json
-COPY ./packages/coordinator/package.json /packages/coordinator/package.json
-COPY ./packages/core/package.json /packages/core/package.json
-COPY ./packages/database/package.json /packages/database/package.json
-COPY ./packages/transaction/package.json /packages/transaction/package.json
-COPY ./packages/tree/package.json /packages/tree/package.json
-COPY ./packages/utils/package.json /packages/utils/package.json
+COPY ./.package-dev.json /proj/package.json
+COPY ./lerna.json /proj/lerna.json
+COPY ./packages/account/package.json /proj/packages/account/package.json
+COPY ./packages/babyjubjub/package.json /proj/packages/babyjubjub/package.json
+COPY ./packages/contracts/package.json /proj/packages/contracts/package.json
+COPY ./packages/coordinator/package.json /proj/packages/coordinator/package.json
+COPY ./packages/core/package.json /proj/packages/core/package.json
+COPY ./packages/database/package.json /proj/packages/database/package.json
+COPY ./packages/transaction/package.json /proj/packages/transaction/package.json
+COPY ./packages/tree/package.json /proj/packages/tree/package.json
+COPY ./packages/utils/package.json /proj/packages/utils/package.json
 
-# Install packages
-RUN cd account && yarn install
-RUN cd coordinator && yarn install
-RUN cd babyjubjub && yarn install
-RUN cd contracts && yarn install
-RUN cd core && yarn install
-RUN cd database && yarn install
-RUN cd transaction && yarn install
-RUN cd tree && yarn install
-RUN cd utils && yarn install
+RUN yarn install
 
 # Copy dist
-COPY ./packages/account/dist /packages/account/dist
-COPY ./packages/babyjubjub/dist /packages/babyjubjub/dist
-COPY ./packages/contracts/dist /packages/contracts/dist
-COPY ./packages/coordinator/dist /packages/coordinator/dist
-COPY ./packages/core/dist /packages/core/dist
-COPY ./packages/database/dist /packages/database/dist
-COPY ./packages/transaction/dist /packages/transaction/dist
-COPY ./packages/tree/dist /packages/tree/dist
-COPY ./packages/utils/dist /packages/utils/dist
+COPY ./packages/account/dist /proj/packages/account/dist 
+COPY ./packages/babyjubjub/dist /proj/packages/babyjubjub/dist
+COPY ./packages/contracts/dist /proj/packages/contracts/dist
+COPY ./packages/coordinator/dist /proj/packages/coordinator/dist
+COPY ./packages/core/dist /proj/packages/core/dist
+COPY ./packages/database/dist /proj/packages/database/dist
+COPY ./packages/transaction/dist /proj/packages/transaction/dist
+COPY ./packages/tree/dist /proj/packages/tree/dist
+COPY ./packages/utils/dist /proj/packages/utils/dist
+RUN lerna clean -y --loglevel silent && lerna bootstrap
 
-COPY ./packages/coordinator/coordinator.json /packages/coordinator/coordinator.json
+COPY ./packages/coordinator/coordinator.docker.json /proj/packages/coordinator/coordinator.json
 EXPOSE 8888
-CMD node /packages/coordinator/dist/cli/index.js --ws ws://localhost:5000 --config /packages/coordinator/coordinator.json
+CMD ["node", "/proj/packages/coordinator/dist/cli/index.js", "--ws ws://localhost:5000", "--config /proj/packages/coordinator/coordinator.json"]

docker-compose.yml

@@ -13,3 +13,6 @@ services:
       dockerfile: ./containers/Coordinator.dockerfile
     ports:
       - "8888:8888"
+    links:
+      - 'testnet:testnet'
+    command: 'node /proj/packages/coordinator/dist/cli/index.js --ws ws://testnet:5000 --config /proj/packages/coordinator/coordinator.json'

package.json

@@ -15,6 +15,7 @@
     "build:contract": "lerna run --parallel build:contract",
     "build:keys": "lerna run build-keys --scope=@zkopru/dataset",
     "build:fresh": "yarn clean && shx rm -rf packages/*/node_modules && yarn build",
+    "testnet": "yarn build:ts && docker-compose build && docker-compose up",
     "clean": "lerna run --parallel clean && shx rm -rf packages/*/node_modules && shx rm -rf .build-cache *.log coverage junit.xml",
     "test": "lerna run test --parallel",
     "pretest:integrate": "docker-compose up -d --build",
@@ -103,7 +104,6 @@
     "merkle-tree-rollup": "^1.1.4",
     "node-docker-api": "^1.1.22",
     "prettier": "^1.16.4",
-    "rocksdb": "^4.1.0",
     "serve": "^11.2.0",
     "shx": "^0.3.2",
     "smt-rollup": "^0.6.3",

packages/coordinator/coordinator.docker.json

@@ -0,0 +1 @@
+{"WARNING": "THIS JSON IS FOR DEVELOPMENT PURPOSE. NEVER USE THIS KEY FOR PRODUCTION", "_":[],"bootstrap":true,"b":true,"ws":"ws://testnet:5000","websocket":"ws://testnet:5000","address":"0x7C728214be9A0049e6a86f2137ec61030D0AA964","a":"0x7C728214be9A0049e6a86f2137ec61030D0AA964","db":"db","maxBytes":131072,"max-bytes":131072,"priceMultiplier":48,"price-multiplier":48,"port":8888,"$0":"zkopru-coordinator","keystore":{"version":3,"id":"875c9411-3fb0-4c8c-ae48-17cb8d525f10","address":"a13dbf344fe1d464711aefbab6a27ba8c3e0d9a6","crypto":{"ciphertext":"94764ae665eacf0d17d73592b525db5d8ca7c2a2110dd5304db8604a079681b6","cipherparams":{"iv":"ae444e7a872cd46f9ece21caa3245f2a"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"ce4ff3cc0d6b20bbc3e7dfae80208bc46ef976f6cdb38b6718ed534bf65eb824","n":8192,"r":8,"p":1},"mac":"c31dfb1c678c02210a87555ceb613f10c71f11885632c8ba40780bb7ade83207"}},"password":"helloworld"}

packages/core/package.json

@@ -42,7 +42,7 @@
     "async-lock": "^1.2.2",
     "big-integer": "^1.6.48",
     "bn.js": "^5.1.1",
-    "ffjavascript": "^0.0.5",
+    "ffjavascript": "^0.1.3",
     "node-fetch": "^2.6.0",
     "snarkjs": "^0.1.27",
     "web3": "^1.2.6",