Refactor/hardhat

.circleci/config.yml

@@ -3,9 +3,9 @@ workflows:
   test_app:
     jobs:
       - build
-      - lint:
-          requires:
-            - build
+      # - lint:
+      #     requires:
+      #       - build
       - load_keys:
           requires:
             - build
@@ -39,10 +39,13 @@ workflows:
       - test_utils:
           requires:
             - build
+      - test_cli:
+          requires:
+            - build
 jobs:
   build:
-    machine:
-      image: ubuntu-2004:202111-01
+    docker:
+      - image: cimg/node:12.22
     steps:
       - checkout
       - run:
@@ -51,9 +54,6 @@ jobs:
       - run:
           name: Install
           command: yarn
-      - run:
-          name: Build Contract
-          command: yarn build:contract
       - run:
           name: Build TS
           command: yarn build:ts:serial
@@ -62,7 +62,7 @@ jobs:
           paths: project
   lint:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -71,7 +71,7 @@ jobs:
           command: yarn lint .
   load_keys:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -85,7 +85,7 @@ jobs:
           paths: project
   test_circuits:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -95,25 +95,19 @@ jobs:
           no_output_timeout: 120m
   test_coordinator:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
-      - run:
-          name: Build Testnet
-          command: docker-compose -f compose/docker-compose.yml build contracts
       - run:
           name: Coordinator Tests
           command: yarn test --scope=@zkopru/coordinator
   test_contracts:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
-      - run:
-          name: Build Testnet
-          command: docker-compose -f compose/docker-compose.yml build contracts-for-integration-test
       - run:
           name: Generate Block Data
           command: |
@@ -124,7 +118,7 @@ jobs:
           command: yarn test --scope=@zkopru/contracts
   test_accounts:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -133,7 +127,7 @@ jobs:
           command: yarn test --scope=@zkopru/account
   test_tree:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -142,7 +136,7 @@ jobs:
           command: yarn test --scope=@zkopru/tree
   test_zkwizard:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -151,7 +145,7 @@ jobs:
           command: yarn test --scope=@zkopru/zk-wizard
   test_client:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -160,7 +154,7 @@ jobs:
           command: yarn test --scope=@zkopru/client
   test_database:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -169,7 +163,7 @@ jobs:
           command: yarn test --scope=@zkopru/database
   test_babyjubjub:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -178,7 +172,7 @@ jobs:
           command: yarn test --scope=@zkopru/babyjubjub
   test_utils:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
@@ -187,13 +181,21 @@ jobs:
           command: yarn test --scope=@zkopru/utils
   test_integration:
     machine:
-      image: ubuntu-2004:202111-01
+      image: ubuntu-2204:2022.07.1
     steps:
       - attach_workspace:
           at: ~/
-      - run:
-          name: Build Testnet
-          command: docker-compose -f compose/docker-compose.yml build contracts-for-integration-test
       - run:
           name: Integration Tests
-          command: DEBUG=1 yarn test --scope=@zkopru/integration-test
+          command: LOG_LEVEL=debug yarn test --scope=@zkopru/integration-test
+  test_cli:
+    machine:
+      image: ubuntu-2204:2022.07.1
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Cli Tests
+          command: |
+            cd packages/cli
+            yarn test

.eslintrc.js

@@ -17,7 +17,7 @@ const common = {
     'jest/no-focused-tests': 'error',
     'jest/no-identical-title': 'error',
     'jest/prefer-to-have-length': 'warn',
-    'jest/valid-expect': 'error',
+    'jest/valid-expect': 'off',
     'jest/expect-expect': 'off',
     'jest/prefer-expect-assertions': 'off',
     'jest/no-test-return-statement': 'off',
@@ -35,6 +35,7 @@ const common = {
     'no-shadow': 'off',
     'no-bitwise': 'off',
     'no-unused-vars': 'off',
+    'no-underscore-dangle': 'off',
   },
 }
 

.gitignore

@@ -14,6 +14,9 @@ junit.xml
 dist
 browser
 .build-cache
+**/*/cache
+**/*/artifacts
+**/*/typechain
 keys.tgz
 keys/
 # Created by https://www.gitignore.io/api/node,intellij+all,visualstudiocode

.vscode/settings.json

@@ -11,5 +11,8 @@
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"
   },
+  "[typescript]": { 
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+  },
   "editor.formatOnSave": true
 }

compose/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   contracts:
     image: zkoprunet/contracts:2.0.0-beta.0
     build:
-      context: ../packages/contracts/
+      context: ../
       dockerfile: ../../dockerfiles/Contract.dockerfile
   contracts-for-integration-test:
     image: zkoprunet/contracts-integration-test:2.0.0-beta.0

dockerfiles/Contract.dockerfile

@@ -9,16 +9,15 @@ RUN apk add --no-cache --virtual .gyp \
     python3 \
     make \
     g++ \
-    && yarn global add truffle ganache-cli \
+    && yarn global add ganache-cli \
     && yarn install \
     && apk del .gyp
 
 COPY ./contracts /proj/contracts
 COPY ./utils /proj/utils
-COPY ./migrations /proj/migrations
-COPY ./truffle-config.js /proj/truffle-config.js
-RUN truffle compile
+COPY ./hardhat.config.ts /proj/hardhat.config.ts
+RUN yarn compile
 EXPOSE 5000
 COPY ./keys /proj/keys
-RUN ganache-cli --db=/data -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 & sleep 5 && truffle migrate --network testnet
+RUN ganache-cli --db=/data -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 & sleep 5 && yarn hardhat run scripts/deploy.ts --network testnet
 CMD ganache-cli --db=/data -b 5 -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 --gasPrice 2000000000

dockerfiles/Playground.dockerfile

@@ -13,7 +13,7 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/m
         make \
         g++ \
         chromium \
-        && yarn global add truffle ganache-cli \
+        && yarn global add hardhat ganache-cli \
         && yarn \
         && yarn install \
         && npx lerna run build --scope=@zkopru/cli \
@@ -22,7 +22,7 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/m
 WORKDIR /proj/zkopru/packages/cli
 
 RUN  ganache-cli --db=/proj/data -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 & \
-        sleep 5 && cd /proj/zkopru/packages/contracts && truffle migrate --network testnet
+        sleep 5 && cd /proj/zkopru/packages/contracts && hardhat run  --network testnet
 
 COPY ./packages/circuits/keys /proj/zkopru/packages/cli/keys
 

jest.config.base.js

@@ -1,8 +1,9 @@
 module.exports = {
   roots: ['<rootDir>/src', '<rootDir>/tests'],
   transform: {
-    '^.+\\.ts$': 'ts-jest',
+    '^.+\\.ts$': 'ts-jest'
   },
+  setupFilesAfterEnv: ['jest-expect-message'],
   testRegex: '(/tests/.*.(test|spec)).(jsx?|tsx?)$',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   collectCoverage: true,