clearmatics · AntoineRondelet · May 6, 2020 · May 6, 2020 · May 6, 2020 · May 6, 2020
diff --git a/.gitignore b/.gitignore
@@ -11,12 +11,12 @@
 debug/*json
 
 # Ignore node_modules
-/zeth-contracts/node_modules/*
+/zeth_contracts/node_modules/*
 
-# Ignore pyClient env and build directories
-/pyClient/api/*_pb2.py
-/pyClient/api/*_pb2_grpc.py
-/pyClient/api/*_pb2.pyi
+# Ignore client env and build directories
+/client/api/*_pb2.py
+/client/api/*_pb2_grpc.py
+/client/api/*_pb2.pyi
 
 # Ignore test files
 /_test_contrib_*/

diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ https://eprint.iacr.org/2016/260).
 
 ```bash
 # Start the ethereum test net by running the following commands
-cd zeth-contracts
+cd zeth_contracts
 
 # If the install below fails with python errors, try running:
 npm config set python python2.7
@@ -100,10 +100,10 @@ npm run testrpc
 # Configure your environment
 . ./setup_env.sh
 
-cd pyClient
+cd client
 ```
 
-Follow the steps described in the [pyClient README](pyClient/README.md) to run
+Follow the steps described in the [client README](client/README.md) to run
 tests or invoke the zeth tools.
 
 ## Secure Multi Party Computation for the Groth16 SRS generation

diff --git a/pyClient/.flake8 → client/.flake8 b/pyClient/.flake8 → client/.flake8
diff --git a/pyClient/.pylintrc → client/.pylintrc b/pyClient/.pylintrc → client/.pylintrc
diff --git a/pyClient/Makefile → client/Makefile b/pyClient/Makefile → client/Makefile
diff --git a/pyClient/README.md → client/README.md b/pyClient/README.md → client/README.md
@@ -8,7 +8,7 @@ Ensure that the following are installed:
 - [venv](https://docs.python.org/3/library/venv.html#module-venv) module.
 - gcc
 
-Execute the following inside the `pyClient` directory.
+Execute the following inside the `client` directory.
 ```console
 $ python -m venv env
 $ source env/bin/activate

diff --git a/pyClient/api/__init__.py → client/api/__init__.py b/pyClient/api/__init__.py → client/api/__init__.py
diff --git a/pyClient/api/py.typed → client/api/py.typed b/pyClient/api/py.typed → client/api/py.typed
diff --git a/pyClient/commands/__init__.py → client/commands/__init__.py b/pyClient/commands/__init__.py → client/commands/__init__.py
diff --git a/pyClient/commands/constants.py → client/commands/constants.py b/pyClient/commands/constants.py → client/commands/constants.py
diff --git a/pyClient/commands/py.typed → client/commands/py.typed b/pyClient/commands/py.typed → client/commands/py.typed
diff --git a/pyClient/commands/utils.py → client/commands/utils.py b/pyClient/commands/utils.py → client/commands/utils.py
@@ -73,7 +73,7 @@ def from_json(json_str: str) -> MixerDescription:
 def get_erc20_abi() -> Dict[str, Any]:
     zeth_dir = get_zeth_dir()
     openzeppelin_dir = join(
-        zeth_dir, "zeth-contracts", "node_modules", "openzeppelin-solidity")
+        zeth_dir, "zeth_contracts", "node_modules", "openzeppelin-solidity")
     ierc20_path = join(
         openzeppelin_dir, "contracts", "token", "ERC20", "IERC20.sol")
     compiled_sol = compile_files([ierc20_path])

diff --git a/pyClient/commands/zeth → client/commands/zeth b/pyClient/commands/zeth → client/commands/zeth
diff --git a/pyClient/commands/zeth_deploy.py → client/commands/zeth_deploy.py b/pyClient/commands/zeth_deploy.py → client/commands/zeth_deploy.py
diff --git a/pyClient/commands/zeth_gen_address.py → client/commands/zeth_gen_address.py b/pyClient/commands/zeth_gen_address.py → client/commands/zeth_gen_address.py
diff --git a/pyClient/commands/zeth_ls_commits.py → client/commands/zeth_ls_commits.py b/pyClient/commands/zeth_ls_commits.py → client/commands/zeth_ls_commits.py
diff --git a/pyClient/commands/zeth_ls_notes.py → client/commands/zeth_ls_notes.py b/pyClient/commands/zeth_ls_notes.py → client/commands/zeth_ls_notes.py
diff --git a/pyClient/commands/zeth_mix.py → client/commands/zeth_mix.py b/pyClient/commands/zeth_mix.py → client/commands/zeth_mix.py
diff --git a/pyClient/commands/zeth_sync.py → client/commands/zeth_sync.py b/pyClient/commands/zeth_sync.py → client/commands/zeth_sync.py
diff --git a/pyClient/commands/zeth_token_approve.py → client/commands/zeth_token_approve.py b/pyClient/commands/zeth_token_approve.py → client/commands/zeth_token_approve.py
diff --git a/pyClient/multiple_test.sh → client/multiple_test.sh b/pyClient/multiple_test.sh → client/multiple_test.sh
diff --git a/pyClient/mypy.ini → client/mypy.ini b/pyClient/mypy.ini → client/mypy.ini
diff --git a/pyClient/py.typed → client/py.typed b/pyClient/py.typed → client/py.typed
diff --git a/pyClient/requirements.txt → client/requirements.txt b/pyClient/requirements.txt → client/requirements.txt
diff --git a/pyClient/setup.py → client/setup.py b/pyClient/setup.py → client/setup.py
diff --git a/pyClient/test/__init__.py → client/test/__init__.py b/pyClient/test/__init__.py → client/test/__init__.py
diff --git a/pyClient/test/test_contract_base_mixer.py → client/test/test_contract_base_mixer.py b/pyClient/test/test_contract_base_mixer.py → client/test/test_contract_base_mixer.py
diff --git a/pyClient/test/test_contracts.py → client/test/test_contracts.py b/pyClient/test/test_contracts.py → client/test/test_contracts.py
diff --git a/pyClient/test/test_encryption.py → client/test/test_encryption.py b/pyClient/test/test_encryption.py → client/test/test_encryption.py
diff --git a/pyClient/test/test_ethervalue.py → client/test/test_ethervalue.py b/pyClient/test/test_ethervalue.py → client/test/test_ethervalue.py
diff --git a/pyClient/test/test_joinsplit.py → client/test/test_joinsplit.py b/pyClient/test/test_joinsplit.py → client/test/test_joinsplit.py
diff --git a/pyClient/test/test_merkle_tree.py → client/test/test_merkle_tree.py b/pyClient/test/test_merkle_tree.py → client/test/test_merkle_tree.py
diff --git a/pyClient/test/test_mimc.py → client/test/test_mimc.py b/pyClient/test/test_mimc.py → client/test/test_mimc.py
diff --git a/pyClient/test/test_signing.py → client/test/test_signing.py b/pyClient/test/test_signing.py → client/test/test_signing.py
diff --git a/pyClient/test_commands/__init__.py → client/test_commands/__init__.py b/pyClient/test_commands/__init__.py → client/test_commands/__init__.py
diff --git a/pyClient/test_commands/deploy_test_token.py → client/test_commands/deploy_test_token.py b/pyClient/test_commands/deploy_test_token.py → client/test_commands/deploy_test_token.py
@@ -41,10 +41,10 @@ def compile_token() -> Interface:
     zeth_dir = get_zeth_dir()
     allowed_path = join(
         zeth_dir,
-        "zeth-contracts/node_modules/openzeppelin-solidity/contracts")
+        "zeth_contracts/node_modules/openzeppelin-solidity/contracts")
     path_to_token = join(
         zeth_dir,
-        "zeth-contracts/node_modules/openzeppelin-solidity/contracts",
+        "zeth_contracts/node_modules/openzeppelin-solidity/contracts",
         "token/ERC20/ERC20Mintable.sol")
     # Compilation
     set_solc_version(SOL_COMPILER_VERSION)

diff --git a/pyClient/test_commands/get_balance.py → client/test_commands/get_balance.py b/pyClient/test_commands/get_balance.py → client/test_commands/get_balance.py
diff --git a/pyClient/test_commands/mock.py → client/test_commands/mock.py b/pyClient/test_commands/mock.py → client/test_commands/mock.py
diff --git a/pyClient/test_commands/scenario.py → client/test_commands/scenario.py b/pyClient/test_commands/scenario.py → client/test_commands/scenario.py
diff --git a/...nt/test_commands/test_erc_token_mixing.py → ...nt/test_commands/test_erc_token_mixing.py b/...nt/test_commands/test_erc_token_mixing.py → ...nt/test_commands/test_erc_token_mixing.py
diff --git a/pyClient/test_commands/test_ether_mixing.py → client/test_commands/test_ether_mixing.py b/pyClient/test_commands/test_ether_mixing.py → client/test_commands/test_ether_mixing.py
diff --git a/...est_commands/test_merkle_tree_contract.py → ...est_commands/test_merkle_tree_contract.py b/...est_commands/test_merkle_tree_contract.py → ...est_commands/test_merkle_tree_contract.py
diff --git a/pyClient/zeth/__init__.py → client/zeth/__init__.py b/pyClient/zeth/__init__.py → client/zeth/__init__.py
diff --git a/pyClient/zeth/constants.py → client/zeth/constants.py b/pyClient/zeth/constants.py → client/zeth/constants.py
diff --git a/pyClient/zeth/contracts.py → client/zeth/contracts.py b/pyClient/zeth/contracts.py → client/zeth/contracts.py
diff --git a/pyClient/zeth/encryption.py → client/zeth/encryption.py b/pyClient/zeth/encryption.py → client/zeth/encryption.py
diff --git a/pyClient/zeth/errors.py → client/zeth/errors.py b/pyClient/zeth/errors.py → client/zeth/errors.py
diff --git a/pyClient/zeth/merkle_tree.py → client/zeth/merkle_tree.py b/pyClient/zeth/merkle_tree.py → client/zeth/merkle_tree.py
diff --git a/pyClient/zeth/mimc.py → client/zeth/mimc.py b/pyClient/zeth/mimc.py → client/zeth/mimc.py
diff --git a/pyClient/zeth/mixer_client.py → client/zeth/mixer_client.py b/pyClient/zeth/mixer_client.py → client/zeth/mixer_client.py
diff --git a/pyClient/zeth/ownership.py → client/zeth/ownership.py b/pyClient/zeth/ownership.py → client/zeth/ownership.py
diff --git a/pyClient/zeth/prover_client.py → client/zeth/prover_client.py b/pyClient/zeth/prover_client.py → client/zeth/prover_client.py
diff --git a/pyClient/zeth/py.typed → client/zeth/py.typed b/pyClient/zeth/py.typed → client/zeth/py.typed
diff --git a/pyClient/zeth/signing.py → client/zeth/signing.py b/pyClient/zeth/signing.py → client/zeth/signing.py
diff --git a/pyClient/zeth/testing_utils.py → client/zeth/testing_utils.py b/pyClient/zeth/testing_utils.py → client/zeth/testing_utils.py
diff --git a/pyClient/zeth/timer.py → client/zeth/timer.py b/pyClient/zeth/timer.py → client/zeth/timer.py
diff --git a/pyClient/zeth/utils.py → client/zeth/utils.py b/pyClient/zeth/utils.py → client/zeth/utils.py
@@ -219,7 +219,7 @@ def get_trusted_setup_dir() -> str:
 def get_contracts_dir() -> str:
     return os.environ.get(
         'ZETH_CONTRACTS_DIR',
-        join(get_zeth_dir(), "zeth-contracts", "contracts"))
+        join(get_zeth_dir(), "zeth_contracts", "contracts"))
 
 
 def string_list_flatten(

diff --git a/pyClient/zeth/wallet.py → client/zeth/wallet.py b/pyClient/zeth/wallet.py → client/zeth/wallet.py
diff --git a/pyClient/zeth/zeth_address.py → client/zeth/zeth_address.py b/pyClient/zeth/zeth_address.py → client/zeth/zeth_address.py
diff --git a/pyClient/zeth/zksnark.py → client/zeth/zksnark.py b/pyClient/zeth/zksnark.py → client/zeth/zksnark.py
diff --git a/libzeth/circuits/mimc/mimc.tcc b/libzeth/circuits/mimc/mimc.tcc
@@ -75,7 +75,7 @@ void MiMCe7_permutation_gadget<FieldT>::setup_gadgets(
 
 // The following constants correspond to the iterative computation of sha3_256
 // hash function over the initial seed "clearmatics_mt_seed". See:
-// pyClient/zethCodeConstantsGeneration.py for more details
+// client/zethCodeConstantsGeneration.py for more details
 template<typename FieldT>
 void MiMCe7_permutation_gadget<FieldT>::setup_sha3_constants()
 {

diff --git a/...uits/mimc/mimcRoundConstantsGeneration.py → ...s/mimc/mimc_round_constants_generation.py b/...uits/mimc/mimcRoundConstantsGeneration.py → ...s/mimc/mimc_round_constants_generation.py
@@ -10,7 +10,7 @@
     from Crypto.Hash import keccak
     keccak_256 = lambda *args: keccak.new(digest_bits=256)
 
-# Functions taken from zeth/pyClient/zethMimc.py
+# Functions taken from zeth/client/zethMimc.py
 def to_bytes(*args):
     for i, _ in enumerate(args):
         if isinstance(_, str):

diff --git a/scripts/check_copyright b/scripts/check_copyright
@@ -16,7 +16,7 @@ function check_copyright_files() {
 }
 
 if ! (git ls-files '*.py' | check_copyright_files && \
-          git ls-files 'pyClient/commands' | check_copyright_files && \
+          git ls-files 'client/commands' | check_copyright_files && \
           git ls-files 'mpc/commands' | check_copyright_files && \
           git ls-files '*.hpp' '*.cpp' '*.tcc' | check_copyright_files)
 then

diff --git a/scripts/ci b/scripts/ci
@@ -22,15 +22,15 @@ function format_check() {
 }
 
 function contracts_check() {
-    pushd zeth-contracts
+    pushd zeth_contracts
     npm config set python python2.7
     npm install
     npm run check
     popd
 }
 
 function pyclient_check() {
-    pushd pyClient
+    pushd client
     python3 -m venv env
     . env/bin/activate
     pip install --upgrade pip --progress-bar off

diff --git a/scripts/test_zeth_cli_common.sh b/scripts/test_zeth_cli_common.sh
@@ -1,5 +1,5 @@
 
-TRUFFLE_DIR=`pwd`/zeth-contracts
+TRUFFLE_DIR=`pwd`/zeth_contracts
 
 function run_truffle() {
     pushd ${TRUFFLE_DIR}

diff --git a/setup_env.sh b/setup_env.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export ZETH=`pwd`
-export ZETH_CONTRACTS_DIR=$ZETH/zeth-contracts/contracts
+export ZETH_CONTRACTS_DIR=$ZETH/zeth_contracts/contracts
 export ZETH_DEBUG_DIR=$ZETH/debug
 
 mkdir -p $ZETH/notestore

diff --git a/zeth-contracts/.soliumignore → zeth_contracts/.soliumignore b/zeth-contracts/.soliumignore → zeth_contracts/.soliumignore
diff --git a/zeth-contracts/.soliumrc.json → zeth_contracts/.soliumrc.json b/zeth-contracts/.soliumrc.json → zeth_contracts/.soliumrc.json
diff --git a/zeth-contracts/contracts/BaseMerkleTree.sol → zeth_contracts/contracts/BaseMerkleTree.sol b/zeth-contracts/contracts/BaseMerkleTree.sol → zeth_contracts/contracts/BaseMerkleTree.sol
diff --git a/zeth-contracts/contracts/BaseMixer.sol → zeth_contracts/contracts/BaseMixer.sol b/zeth-contracts/contracts/BaseMixer.sol → zeth_contracts/contracts/BaseMixer.sol
diff --git a/zeth-contracts/contracts/Groth16Mixer.sol → zeth_contracts/contracts/Groth16Mixer.sol b/zeth-contracts/contracts/Groth16Mixer.sol → zeth_contracts/contracts/Groth16Mixer.sol
diff --git a/zeth-contracts/contracts/MerkleTreeMiMC7.sol → zeth_contracts/contracts/MerkleTreeMiMC7.sol b/zeth-contracts/contracts/MerkleTreeMiMC7.sol → zeth_contracts/contracts/MerkleTreeMiMC7.sol
diff --git a/...tracts/contracts/MerkleTreeMiMC7_test.sol → ...tracts/contracts/MerkleTreeMiMC7_test.sol b/...tracts/contracts/MerkleTreeMiMC7_test.sol → ...tracts/contracts/MerkleTreeMiMC7_test.sol
diff --git a/...-contracts/contracts/MerkleTreeSha256.sol → ..._contracts/contracts/MerkleTreeSha256.sol b/...-contracts/contracts/MerkleTreeSha256.sol → ..._contracts/contracts/MerkleTreeSha256.sol
diff --git a/zeth-contracts/contracts/MiMC7.sol → zeth_contracts/contracts/MiMC7.sol b/zeth-contracts/contracts/MiMC7.sol → zeth_contracts/contracts/MiMC7.sol
diff --git a/zeth-contracts/contracts/Migrations.sol → zeth_contracts/contracts/Migrations.sol b/zeth-contracts/contracts/Migrations.sol → zeth_contracts/contracts/Migrations.sol
diff --git a/...contracts/contracts/OTSchnorrVerifier.sol → ...contracts/contracts/OTSchnorrVerifier.sol b/...contracts/contracts/OTSchnorrVerifier.sol → ...contracts/contracts/OTSchnorrVerifier.sol
diff --git a/zeth-contracts/contracts/Pairing.sol → zeth_contracts/contracts/Pairing.sol b/zeth-contracts/contracts/Pairing.sol → zeth_contracts/contracts/Pairing.sol
diff --git a/zeth-contracts/contracts/Pghr13Mixer.sol → zeth_contracts/contracts/Pghr13Mixer.sol b/zeth-contracts/contracts/Pghr13Mixer.sol → zeth_contracts/contracts/Pghr13Mixer.sol
diff --git a/zeth-contracts/contracts/README.md → zeth_contracts/contracts/README.md b/zeth-contracts/contracts/README.md → zeth_contracts/contracts/README.md
diff --git a/...ntracts/migrations/1_initial_migration.js → ...ntracts/migrations/1_initial_migration.js b/...ntracts/migrations/1_initial_migration.js → ...ntracts/migrations/1_initial_migration.js
diff --git a/...ontracts/migrations/2_deploy_contracts.js → ...ontracts/migrations/2_deploy_contracts.js b/...ontracts/migrations/2_deploy_contracts.js → ...ontracts/migrations/2_deploy_contracts.js
diff --git a/zeth-contracts/package.json → zeth_contracts/package.json b/zeth-contracts/package.json → zeth_contracts/package.json
diff --git a/zeth-contracts/test/bytes.js → zeth_contracts/test/bytes.js b/zeth-contracts/test/bytes.js → zeth_contracts/test/bytes.js
diff --git a/zeth-contracts/test/merkleTree.js → zeth_contracts/test/merkleTree.js b/zeth-contracts/test/merkleTree.js → zeth_contracts/test/merkleTree.js
diff --git a/zeth-contracts/truffle.js → zeth_contracts/truffle.js b/zeth-contracts/truffle.js → zeth_contracts/truffle.js