submodule: update zeth [v0.8.0]

.github/workflows/onpullrequest.yml

@@ -16,9 +16,12 @@ jobs:
       uses: actions/cache@v2
       with:
         key: grpc-1.31.x-${{ runner.os }}
-        path: depends/grpc
+        path: depends/zeth/depends/grpc
     - name: Build grpc
-      run: if ! [ -d depends/grpc ] ; then depends/zeth/scripts/install_grpc /usr v1.31.x depends/grpc ; fi
+      run: |
+        pushd depends/zeth
+        if ! [ -d depends/grpc ] ; then scripts/install-grpc /usr v1.31.x ; fi
+        popd
 
   build-linux-full-tests:
     runs-on: ubuntu-20.04
@@ -34,7 +37,7 @@ jobs:
       uses: actions/cache@v2
       with:
         key: grpc-1.31.x-${{ runner.os }}
-        path: depends/grpc
+        path: depends/zeth/depends/grpc
     - name: Cache pip
       uses: actions/cache@v2
       with:
@@ -51,7 +54,9 @@ jobs:
         key: build-linux-full-tests-npm-${{ hashFiles('**/package-lock.json') }}-${{ runner.os }}
     - name: Install dependencies
       run: |
-        depends/zeth/scripts/install_grpc /usr v1.31.x depends/grpc
+        pushd depends/zeth
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        popd
     - name: Execute
       run: CI_FULL_TESTS=1 CI_CONFIG=Release scripts/ci build
 
@@ -69,7 +74,7 @@ jobs:
       uses: actions/cache@v2
       with:
         key: grpc-1.31.x-${{ runner.os }}
-        path: depends/grpc
+        path: depends/zeth/depends/grpc
     - name: Cache pip
       uses: actions/cache@v2
       with:
@@ -86,6 +91,8 @@ jobs:
         key: build-linux-integration-tests-npm-${{ hashFiles('**/package-lock.json') }}-${{ runner.os }}
     - name: Install dependencies
       run: |
-        depends/zeth/scripts/install_grpc /usr v1.31.x depends/grpc
+        pushd depends/zeth
+        INSTALL_ONLY=1 scripts/install-grpc /usr v1.31.x
+        popd
     - name: Execute
       run: CI_INTEGRATION_TESTS=1 CI_CONFIG=Release scripts/ci build

client/README.md

@@ -96,15 +96,15 @@ Moreover, the CLIs are tested using the following script:
 
 ```console
 (env)$ cd ..
-(env)$ ./scripts/test_client
+(env)$ ./scripts/test-client
 ```
 
 # The `zecale` command line interface
 
 The `zecale` command exposes Zecale operations via a command line interface. A
 brief description is given in this section. More details are available via
 `zecale --help`, and example usage can be seen in the [client test
-script](../scripts/test_client).
+script](../scripts/test-client).
 
 ## Environment
 
@@ -167,5 +167,5 @@ zecale_dummy_app deploy
 ```
 
 For a more comprehensive overview on how to use Zecale with a base
-application, please refer to the [zeth-zecale integration test script](../scripts/test_zeth_zecale).
+application, please refer to the [zeth-zecale integration test script](../scripts/test-zeth-zecale).
 

client/setup.py

@@ -19,17 +19,9 @@
     version='0.4',
     description='Client to interact with Zecale server',
     packages=find_packages(),
-    # zip_safe=False,
     install_requires=[
-        "mypy==0.790",
-        "mypy-protobuf==1.23",
-        "flake8==3.8.3",
-        "pylint==2.6",
-        "click==7.0",
-        "click-default-group==1.2",
-        "protobuf==3.13.0",
-        "grpcio==1.33.2",
-        "grpcio-tools==1.33.2",
+        # Dependencies installed as part of zeth client. Further dependencies
+        # are listed here:
     ],
     entry_points={
         'console_scripts': [

libzecale/circuits/pairing/pairing_params.hpp

@@ -83,10 +83,8 @@ template<typename ppT> class pairing_selector;
  * Below are various template aliases (used for convenience).
  */
 
-template<typename ppT>
-using FqkT =
-    typename pairing_selector<ppT>::FqkT; // TODO: better name when stable
-
+// TODO: better name when stable
+template<typename ppT> using FqkT = typename pairing_selector<ppT>::FqkT;
 template<typename ppT>
 using Fqe_variable = typename pairing_selector<ppT>::Fqe_variable_type;
 template<typename ppT>

scripts/ci

@@ -4,7 +4,9 @@ platform=`uname`
 echo platform=${platform}
 echo "running against commit: "`git log --oneline --no-decorate -n 1`
 
-. depends/zeth/scripts/ci_utils.sh
+pushd depends/zeth
+. scripts/ci_utils.sh
+popd
 . scripts/ci_utils.sh
 
 set -x
@@ -82,7 +84,7 @@ function integration_tests() {
 
     # Run integration test
     . client/env/bin/activate
-    ./scripts/test_client
+    ./scripts/test-client
     deactivate
 
     aggregator_stop

scripts/test_client → scripts/test-client

@@ -14,9 +14,9 @@ TEST_DATA_DIR=${ROOT_DIR}/testdata
 function setup_user() {
     mkdir -p $1
     pushd $1
-    [ -e eth-network ] || zeth_helper eth-gen-network-config
+    [ -e eth-network ] || zeth-helper eth-gen-network-config
     [ -e eth-address ] || \
-        (zeth_helper eth-gen-address && zeth_helper eth-fund)
+        (zeth-helper eth-gen-address && zeth-helper eth-fund)
     popd
 }
 

scripts/test_zeth_zecale → scripts/test-zeth-zecale

@@ -10,9 +10,9 @@ ROOT_DIR=`pwd`
 function setup_user() {
     mkdir -p $1
     pushd $1
-    [ -e eth-network ] || zeth_helper eth-gen-network-config $2
+    [ -e eth-network ] || zeth-helper eth-gen-network-config $2
     [ -e eth-address ] || \
-        (zeth_helper eth-gen-address && zeth_helper eth-fund)
+        (zeth-helper eth-gen-address && zeth-helper eth-fund)
     [ -e zeth-address.priv ] || zeth gen-address
     popd
 }
@@ -52,7 +52,7 @@ pushd zeth_deployer
     [ -e vk-hash ] || zecale nested-verification-key-hash zeth-vk.json > vk-hash
 
     # Deploy zeth using zecale_address and vk_hash.
-    dispatcher_address=`zeth_helper eth-get-contract-address zecale-instance`
+    dispatcher_address=`zeth-helper eth-get-contract-address zecale-instance`
     [ -e zeth-instance ] || zeth deploy \
                                  --permitted-dispatcher ${dispatcher_address} \
                                  --vk-hash `cat vk-hash`