Merge pull request #431 from clearmatics/develop

v0.9.0
clearmatics · Sep 1, 2022 · 0c7fcf5 · 0c7fcf5
2 parents cb57aae + 1377d82
commit 0c7fcf5
Show file tree

Hide file tree

Showing 298 changed files with 555 additions and 631 deletions.
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
diff --git a/.github/workflows/dev-docker-apps.yml b/.github/workflows/dev-docker-apps.yml
@@ -21,7 +21,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        app: ['mpc', 'client', 'prover']
+        # Disable mpc for now
+        # app: ['mpc', 'client', 'prover']
+        app: ['client', 'prover']
       max-parallel: 3
 
     steps:

diff --git a/.github/workflows/dev-docs.yml b/.github/workflows/dev-docs.yml
@@ -12,10 +12,10 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Build grpc
-      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.31.x ; fi
+      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.44.x ; fi
 
   build-documentation:
     runs-on: ubuntu-20.04
@@ -28,17 +28,17 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Install dependencies
       run: |
         sudo apt update -y
         source scripts/build_utils.sh
         init_platform
         cpp_build_setup
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y doxygen graphviz
-    - name: Generatate documentation
+    - name: Generate documentation
       run: |
         mkdir -p build
         pushd build

diff --git a/.github/workflows/onpullrequest-build-ubuntu.yml b/.github/workflows/onpullrequest-build-ubuntu.yml
@@ -19,10 +19,10 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Build grpc
-      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.31.x ; fi
+      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.44.x ; fi
 
   # Extract the commits of submodules for use by cache steps
   onpr-submodules:
@@ -48,36 +48,21 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 10
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
-    # - name: Cache ccache
-    #   uses: actions/cache@v2
-    #   with:
-    #     key: prover-tests-ccache-${{ needs.onpr-submodules.outputs.commits }}-${{ matrix.curve }}-${{ runner.os }}
-    #     path: ~/.ccache
     - name: Cache pip
       uses: actions/cache@v2
       with:
         path: |
           ~/.cache/pip
           ~/Library/Caches/pip
         key: prover-tests-pip-${{ hashFiles('**/setup.py') }}-${{ runner.os }}
-    - name: Cache npm
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.npm
-          depends/ganache-cli/node_modules
-        key: prover-tests-npm-${{ hashFiles('**/package-lock.json') }}-${{ runner.os }}
     - name: Install dependencies
       run: |
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y ccache
     - name: Execute
       run: CI_CONFIG=Release CI_CURVE=${{ matrix.curve }} CI_PROVER_TESTS=1 scripts/ci build
@@ -93,38 +78,21 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 10
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
-    # ccache in this job seems to make the tests crash occasionally. Disabling
-    # until the cause is understood.
-    # - name: Cache ccache
-    #   uses: actions/cache@v2
-    #   with:
-    #     key: integration-tests-ccache-${{ needs.onpr-submodules.outputs.commits }}-${{ matrix.curve }}-${{ runner.os }}
-    #     path: ~/.ccache
     - name: Cache pip
       uses: actions/cache@v2
       with:
         path: |
           ~/.cache/pip
           ~/Library/Caches/pip
         key: integration-tests-pip-${{ hashFiles('**/setup.py') }}-${{ runner.os }}
-    - name: Cache npm
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.npm
-          depends/ganache-cli/node_modules
-        key: integration-tests-npm-${{ hashFiles('**/package-lock.json') }}-${{ runner.os }}
     - name: Install dependencies
       run: |
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y ccache
     - name: Execute
       run: CI_CONFIG=Release CI_CURVE=${{ matrix.curve }} CI_FULL_TESTS=1 CI_INTEGRATION_TESTS=1 scripts/ci build
diff --git a/.github/workflows/onpush-build-ubuntu.yml b/.github/workflows/onpush-build-ubuntu.yml
@@ -19,10 +19,10 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Build grpc
-      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.31.x ; fi
+      run: if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.44.x ; fi
 
   build-linux:
     runs-on: ubuntu-20.04
@@ -37,7 +37,7 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Cache pip (for mpc tests)
       uses: actions/cache@v2
@@ -46,7 +46,7 @@ jobs:
         key: build-linux-pip-${{ hashFiles('**/setup.py') }}-${{ runner.os }}
     - name: Install dependencies
       run: |
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y ccache
     - name: Execute
       run: CI_CHECK_FORMAT=1 CI_MPC_TESTS=1 CI_CONFIG=${{ matrix.config }} scripts/ci build
@@ -61,11 +61,11 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Install dependencies
       run: |
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y ccache
     - name: Execute
       run: CI_CONFIG=Release CI_ZKSNARK=PGHR13 scripts/ci build
@@ -80,11 +80,11 @@ jobs:
     - name: Cache grpc
       uses: actions/cache@v2
       with:
-        key: grpc-1.31.x-${{ runner.os }}
+        key: grpc-1.44.x-${{ runner.os }}
         path: depends/grpc
     - name: Install dependencies
       run: |
-        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.44.x
         sudo apt install -y ccache
     - name: Execute
       run: CI_CONFIG=Release CI_CURVE=BLS12_377 scripts/ci build
diff --git a/.github/workflows/onpush-checks.yml b/.github/workflows/onpush-checks.yml
@@ -12,16 +12,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '10'
-    - name: Cache npm (incl ganache-cli/node_modules)
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.npm
-          depends/ganache-cli/node_modules
-        key: check-contracts-npm-${{ hashFiles('**/package-lock.json') }}-${{ runner.os }}
     - name: Cache pip
       uses: actions/cache@v2
       with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 # Sets the env vars PROJECT_SOURCE_DIR, and PROJECT_BINARY_DIR
 project(zeth CXX)
 
-# Versionning of the project
+# Versioning of the project
 set(ZETH_VERSION_MAJOR 0)
 set(ZETH_VERSION_MINOR 8)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,14 +12,14 @@ Coding standards are described in full [here](CODING_STANDARDS.md).
 ## Pull Request Process
 
 1. Ensure any install or build dependencies are removed from your branch before opening a Pull Request.
-   Furthermore, please do make sure to extend the [.gitignore](./.gitignore) file to keep unecessary files
+   Furthermore, please do make sure to extend the [.gitignore](./.gitignore) file to keep unnecessary files
    outside of the version control.
 2. Update the README.md files and the relevant code comments with details of changes to the interface.
    This includes: new environment variables, exposed ports, useful file locations and container parameters for instance.
 3. If the Pull Request requires a version change (e.g. a "fix" or new release), increase the version numbers in all relevant files.
    The versioning scheme we use is [SemVer][semver].
 4. All Pull Requests must be reviewed by a code owner. While under review, a code owner may ask the Pull Request author to *rebase*
-   her branch on top of the targetted "base" branch. If so, please be sure to *rebase* on top of the base branch (and *not merge*
+   her branch on top of the targeted "base" branch. If so, please be sure to *rebase* on top of the base branch (and *not merge*
    the base branch in your branch), as we strive to avoid duplicated merge commits in the git history (merging is a unidirectional
    process e.g. `master < develop < feature` or `master < hotfix`).
 5. Once approved, the Pull Request is merged by one of the code owners.

diff --git a/Dockerfile-base b/Dockerfile-base
@@ -31,7 +31,7 @@ RUN apk --update --no-cache add \
         vim \
         curl
 
-RUN git clone -b v1.31.x https://github.com/grpc/grpc /var/local/git/grpc
+RUN git clone -b v1.44.x https://github.com/grpc/grpc /var/local/git/grpc
 RUN cd /var/local/git/grpc && git submodule update --init --recursive
 
 # Build protobuf independently and install libraries in /usr/lib

diff --git a/README.md b/README.md
@@ -107,17 +107,7 @@ https://eprint.iacr.org/2016/260).
 #### Terminal 2: Ethereum testnet
 
 ```bash
-# Start the Ethereum test net by running the following commands
-cd zeth_contracts
-
-# If the install below fails with python errors, try running:
-npm config set python python2.7
-
-# Install dependencies
-npm install
-
-# Start a local Ethereum testnet
-npm run testrpc
+scripts/ganache-start
 ```
 
 #### Terminal 3: Python client

diff --git a/client/py.typed b/client/py.typed
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+
 

diff --git a/client/setup.py b/client/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+
 
@@ -28,9 +28,9 @@
         "pylint==2.9",
         "click==7.0",
         "click-default-group==1.2",
-        "grpcio==1.33.2",
-        "grpcio-tools==1.33.2",
-        "protobuf==3.13.0",
+        "grpcio==1.44",
+        "grpcio-tools==1.44",
+        "protobuf==3.18",
         "py_ecc==1.7.1",
         "py-solc-x==1.1.0",
         "cryptography==3.3.2",

diff --git a/client/test_commands/__init__.py b/client/test_commands/__init__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+
diff --git a/client/test_commands/deploy_test_token.py b/client/test_commands/deploy_test_token.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+
 

diff --git a/client/test_commands/mock.py b/client/test_commands/mock.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+
 

diff --git a/client/test_commands/scenario.py b/client/test_commands/scenario.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2015-2021 Clearmatics Technologies Ltd
+# Copyright (c) 2015-2022 Clearmatics Technologies Ltd
 #
 # SPDX-License-Identifier: LGPL-3.0+