From 6cc3f17cadc521b85d5717215ccbfb201eda7b6c Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Fri, 12 Jul 2024 13:57:42 +0400 Subject: [PATCH] chore: Prepare 0.1.0 release (#2434) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ - ⚠️ Adds `prover_dal` to the core workspace and removes from prover workspace. This is done without changing any paths. It's required because house keeper is a part of core workspace. cc @EmilLuta - Merges `zksync_crypto` and `zksync_crypto_primitives` crates - Sets descriptions for crates - Sets `publish = false` where required - Changes manually set versions to `version.workspace = true` - Specifies versions in the workspace `Cargo.toml` for local deps. ## Why ❔ Publishing on crates.io ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. --- Cargo.lock | 24 +--- Cargo.toml | 133 +++++++++--------- core/bin/block_reverter/Cargo.toml | 1 + core/bin/contract-verifier/Cargo.toml | 2 +- core/bin/external_node/Cargo.toml | 1 + core/bin/genesis_generator/Cargo.toml | 4 +- .../Cargo.toml | 1 + core/bin/snapshots_creator/Cargo.toml | 1 + .../bin/system-constants-generator/Cargo.toml | 2 +- core/bin/verified_sources_fetcher/Cargo.toml | 1 + core/bin/zksync_server/Cargo.toml | 1 + core/bin/zksync_tee_prover/Cargo.toml | 2 + core/lib/basic_types/Cargo.toml | 3 +- core/lib/circuit_breaker/Cargo.toml | 3 +- core/lib/config/Cargo.toml | 3 +- core/lib/constants/Cargo.toml | 3 +- core/lib/contract_verifier/Cargo.toml | 3 +- core/lib/contracts/Cargo.toml | 3 +- core/lib/crypto/Cargo.toml | 23 --- core/lib/crypto/README.md | 10 -- core/lib/crypto/src/lib.rs | 1 - core/lib/crypto_primitives/Cargo.toml | 3 + .../src/hasher/blake2.rs | 0 .../src/hasher/keccak.rs | 0 .../src/hasher/mod.rs | 0 .../src/hasher/sha256.rs | 0 core/lib/crypto_primitives/src/lib.rs | 1 + core/lib/da_client/Cargo.toml | 1 + core/lib/dal/Cargo.toml | 3 +- core/lib/db_connection/Cargo.toml | 3 +- core/lib/default_da_clients/Cargo.toml | 1 + core/lib/env_config/Cargo.toml | 3 +- core/lib/eth_client/Cargo.toml | 3 +- core/lib/eth_signer/Cargo.toml | 3 +- core/lib/external_price_api/Cargo.toml | 3 +- core/lib/health_check/Cargo.toml | 3 +- core/lib/l1_contract_interface/Cargo.toml | 1 + core/lib/mempool/Cargo.toml | 1 + core/lib/merkle_tree/Cargo.toml | 5 +- .../lib/merkle_tree/examples/loadtest/main.rs | 2 +- core/lib/merkle_tree/examples/recovery.rs | 2 +- core/lib/merkle_tree/src/domain.rs | 2 +- core/lib/merkle_tree/src/hasher/mod.rs | 2 +- core/lib/merkle_tree/src/hasher/nodes.rs | 2 +- core/lib/merkle_tree/src/lib.rs | 2 +- core/lib/merkle_tree/src/recovery/mod.rs | 2 +- core/lib/merkle_tree/src/storage/tests.rs | 2 +- .../merkle_tree/tests/integration/common.rs | 2 +- .../merkle_tree/tests/integration/domain.rs | 2 +- .../tests/integration/merkle_tree.rs | 2 +- .../merkle_tree/tests/integration/recovery.rs | 2 +- core/lib/mini_merkle_tree/Cargo.toml | 5 +- core/lib/mini_merkle_tree/src/lib.rs | 2 +- core/lib/multivm/Cargo.toml | 3 +- core/lib/node_framework_derive/Cargo.toml | 1 + core/lib/object_store/Cargo.toml | 3 +- core/lib/protobuf_config/Cargo.toml | 3 +- core/lib/prover_interface/Cargo.toml | 3 +- core/lib/queued_job_processor/Cargo.toml | 3 +- core/lib/snapshots_applier/Cargo.toml | 3 +- core/lib/state/Cargo.toml | 3 +- core/lib/storage/Cargo.toml | 3 +- core/lib/tee_verifier/Cargo.toml | 7 +- core/lib/tee_verifier/src/lib.rs | 2 +- core/lib/types/Cargo.toml | 3 +- core/lib/utils/Cargo.toml | 3 +- core/lib/vlog/Cargo.toml | 3 +- core/lib/vm_utils/Cargo.toml | 3 +- core/lib/web3_decl/Cargo.toml | 3 +- core/lib/zksync_core_leftovers/Cargo.toml | 3 +- core/node/api_server/Cargo.toml | 3 +- core/node/base_token_adjuster/Cargo.toml | 1 + core/node/block_reverter/Cargo.toml | 3 +- core/node/commitment_generator/Cargo.toml | 3 +- core/node/consensus/Cargo.toml | 3 +- core/node/consistency_checker/Cargo.toml | 3 +- .../contract_verification_server/Cargo.toml | 5 +- core/node/da_dispatcher/Cargo.toml | 1 + core/node/db_pruner/Cargo.toml | 1 + core/node/eth_sender/Cargo.toml | 1 + core/node/eth_watch/Cargo.toml | 3 +- core/node/fee_model/Cargo.toml | 1 + core/node/genesis/Cargo.toml | 1 + core/node/house_keeper/Cargo.toml | 3 +- core/node/metadata_calculator/Cargo.toml | 5 +- .../metadata_calculator/src/api_server/mod.rs | 2 +- core/node/node_framework/Cargo.toml | 3 +- core/node/node_storage_init/Cargo.toml | 3 +- core/node/node_sync/Cargo.toml | 3 +- core/node/proof_data_handler/Cargo.toml | 3 +- core/node/reorg_detector/Cargo.toml | 3 +- core/node/shared_metrics/Cargo.toml | 3 +- core/node/state_keeper/Cargo.toml | 3 +- .../tee_verifier_input_producer/Cargo.toml | 3 +- core/node/test_utils/Cargo.toml | 1 + core/node/vm_runner/Cargo.toml | 1 + prover/Cargo.lock | 19 +-- prover/Cargo.toml | 1 - prover/prover_dal/Cargo.toml | 1 + zk_toolbox/Cargo.lock | 17 +-- 100 files changed, 224 insertions(+), 221 deletions(-) delete mode 100644 core/lib/crypto/Cargo.toml delete mode 100644 core/lib/crypto/README.md delete mode 100644 core/lib/crypto/src/lib.rs rename core/lib/{crypto => crypto_primitives}/src/hasher/blake2.rs (100%) rename core/lib/{crypto => crypto_primitives}/src/hasher/keccak.rs (100%) rename core/lib/{crypto => crypto_primitives}/src/hasher/mod.rs (100%) rename core/lib/{crypto => crypto_primitives}/src/hasher/sha256.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index ea62dd22772c..f73206e46e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8414,30 +8414,18 @@ dependencies = [ "zksync_protobuf_config", ] -[[package]] -name = "zksync_crypto" -version = "0.1.0" -dependencies = [ - "blake2 0.10.6", - "hex", - "once_cell", - "serde", - "serde_json", - "sha2 0.10.8", - "thiserror", - "zksync_basic_types", -] - [[package]] name = "zksync_crypto_primitives" version = "0.1.0" dependencies = [ "anyhow", + "blake2 0.10.6", "hex", "rand 0.8.5", "secp256k1", "serde", "serde_json", + "sha2 0.10.8", "thiserror", "zksync_basic_types", "zksync_utils", @@ -8803,7 +8791,7 @@ dependencies = [ "tracing", "tracing-subscriber", "vise", - "zksync_crypto", + "zksync_crypto_primitives", "zksync_prover_interface", "zksync_storage", "zksync_system_constants", @@ -8832,7 +8820,7 @@ dependencies = [ "tracing", "vise", "zksync_config", - "zksync_crypto", + "zksync_crypto_primitives", "zksync_dal", "zksync_health_check", "zksync_merkle_tree", @@ -8853,7 +8841,7 @@ dependencies = [ "criterion", "once_cell", "zksync_basic_types", - "zksync_crypto", + "zksync_crypto_primitives", ] [[package]] @@ -9550,7 +9538,7 @@ dependencies = [ "zksync_basic_types", "zksync_config", "zksync_contracts", - "zksync_crypto", + "zksync_crypto_primitives", "zksync_dal", "zksync_db_connection", "zksync_merkle_tree", diff --git a/Cargo.toml b/Cargo.toml index f36af0a33c3e..aa77cf2f7cc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,6 @@ members = [ "core/lib/constants", "core/lib/contract_verifier", "core/lib/contracts", - "core/lib/crypto", "core/lib/circuit_breaker", "core/lib/dal", "core/lib/env_config", @@ -78,6 +77,9 @@ members = [ "core/tests/loadnext", "core/tests/vm-benchmark", "core/tests/vm-benchmark/harness", + + # Parts of prover workspace that are needed for Core workspace + "prover/prover_dal" ] resolver = "2" @@ -219,70 +221,69 @@ zksync_protobuf = "=0.1.0-rc.2" zksync_protobuf_build = "=0.1.0-rc.2" # "Local" dependencies -zksync_multivm = { path = "core/lib/multivm" } -zksync_prover_dal = { path = "prover/prover_dal" } -zksync_vlog = { path = "core/lib/vlog" } -zksync_vm_utils = { path = "core/lib/vm_utils" } -zksync_vm_benchmark_harness = { path = "core/tests/vm-benchmark/harness" } -zksync_basic_types = { path = "core/lib/basic_types" } -zksync_circuit_breaker = { path = "core/lib/circuit_breaker" } -zksync_config = { path = "core/lib/config" } -zksync_contract_verifier_lib = { path = "core/lib/contract_verifier" } -zksync_contracts = { path = "core/lib/contracts" } -zksync_core_leftovers = { path = "core/lib/zksync_core_leftovers" } -zksync_crypto = { path = "core/lib/crypto" } -zksync_dal = { path = "core/lib/dal" } -zksync_db_connection = { path = "core/lib/db_connection" } -zksync_env_config = { path = "core/lib/env_config" } -zksync_eth_client = { path = "core/lib/eth_client" } -zksync_da_client = { path = "core/lib/da_client" } -zksync_default_da_clients = { path = "core/lib/default_da_clients" } -zksync_eth_signer = { path = "core/lib/eth_signer" } -zksync_health_check = { path = "core/lib/health_check" } -zksync_l1_contract_interface = { path = "core/lib/l1_contract_interface" } -zksync_mempool = { path = "core/lib/mempool" } -zksync_merkle_tree = { path = "core/lib/merkle_tree" } -zksync_mini_merkle_tree = { path = "core/lib/mini_merkle_tree" } -zksync_object_store = { path = "core/lib/object_store" } -zksync_protobuf_config = { path = "core/lib/protobuf_config" } -zksync_prover_interface = { path = "core/lib/prover_interface" } -zksync_queued_job_processor = { path = "core/lib/queued_job_processor" } -zksync_snapshots_applier = { path = "core/lib/snapshots_applier" } -zksync_state = { path = "core/lib/state" } -zksync_storage = { path = "core/lib/storage" } -zksync_system_constants = { path = "core/lib/constants" } -zksync_tee_verifier = { path = "core/lib/tee_verifier" } -zksync_test_account = { path = "core/tests/test_account" } -zksync_types = { path = "core/lib/types" } -zksync_utils = { path = "core/lib/utils" } -zksync_web3_decl = { path = "core/lib/web3_decl" } -zksync_crypto_primitives = { path = "core/lib/crypto_primitives" } -zksync_external_price_api = { path = "core/lib/external_price_api" } +zksync_multivm = { version = "0.1.0", path = "core/lib/multivm" } +zksync_prover_dal = { version = "0.1.0", path = "prover/prover_dal" } +zksync_vlog = { version = "0.1.0", path = "core/lib/vlog" } +zksync_vm_utils = { version = "0.1.0", path = "core/lib/vm_utils" } +zksync_vm_benchmark_harness = { version = "0.1.0", path = "core/tests/vm-benchmark/harness" } +zksync_basic_types = { version = "0.1.0", path = "core/lib/basic_types" } +zksync_circuit_breaker = { version = "0.1.0", path = "core/lib/circuit_breaker" } +zksync_config = { version = "0.1.0", path = "core/lib/config" } +zksync_contract_verifier_lib = { version = "0.1.0", path = "core/lib/contract_verifier" } +zksync_contracts = { version = "0.1.0", path = "core/lib/contracts" } +zksync_core_leftovers = { version = "0.1.0", path = "core/lib/zksync_core_leftovers" } +zksync_dal = { version = "0.1.0", path = "core/lib/dal" } +zksync_db_connection = { version = "0.1.0", path = "core/lib/db_connection" } +zksync_env_config = { version = "0.1.0", path = "core/lib/env_config" } +zksync_eth_client = { version = "0.1.0", path = "core/lib/eth_client" } +zksync_da_client = { version = "0.1.0", path = "core/lib/da_client" } +zksync_default_da_clients = { version = "0.1.0", path = "core/lib/default_da_clients" } +zksync_eth_signer = { version = "0.1.0", path = "core/lib/eth_signer" } +zksync_health_check = { version = "0.1.0", path = "core/lib/health_check" } +zksync_l1_contract_interface = { version = "0.1.0", path = "core/lib/l1_contract_interface" } +zksync_mempool = { version = "0.1.0", path = "core/lib/mempool" } +zksync_merkle_tree = { version = "0.1.0", path = "core/lib/merkle_tree" } +zksync_mini_merkle_tree = { version = "0.1.0", path = "core/lib/mini_merkle_tree" } +zksync_object_store = { version = "0.1.0", path = "core/lib/object_store" } +zksync_protobuf_config = { version = "0.1.0", path = "core/lib/protobuf_config" } +zksync_prover_interface = { version = "0.1.0", path = "core/lib/prover_interface" } +zksync_queued_job_processor = { version = "0.1.0", path = "core/lib/queued_job_processor" } +zksync_snapshots_applier = { version = "0.1.0", path = "core/lib/snapshots_applier" } +zksync_state = { version = "0.1.0", path = "core/lib/state" } +zksync_storage = { version = "0.1.0", path = "core/lib/storage" } +zksync_system_constants = { version = "0.1.0", path = "core/lib/constants" } +zksync_tee_verifier = { version = "0.1.0", path = "core/lib/tee_verifier" } +zksync_test_account = { version = "0.1.0", path = "core/tests/test_account" } +zksync_types = { version = "0.1.0", path = "core/lib/types" } +zksync_utils = { version = "0.1.0", path = "core/lib/utils" } +zksync_web3_decl = { version = "0.1.0", path = "core/lib/web3_decl" } +zksync_crypto_primitives = { version = "0.1.0", path = "core/lib/crypto_primitives" } +zksync_external_price_api = { version = "0.1.0", path = "core/lib/external_price_api" } # Framework and components -zksync_node_framework = { path = "core/node/node_framework" } -zksync_node_framework_derive = { path = "core/lib/node_framework_derive" } -zksync_eth_watch = { path = "core/node/eth_watch" } -zksync_shared_metrics = { path = "core/node/shared_metrics" } -zksync_proof_data_handler = { path = "core/node/proof_data_handler" } -zksync_block_reverter = { path = "core/node/block_reverter" } -zksync_commitment_generator = { path = "core/node/commitment_generator" } -zksync_house_keeper = { path = "core/node/house_keeper" } -zksync_node_genesis = { path = "core/node/genesis" } -zksync_da_dispatcher = { path = "core/node/da_dispatcher" } -zksync_eth_sender = { path = "core/node/eth_sender" } -zksync_node_db_pruner = { path = "core/node/db_pruner" } -zksync_node_fee_model = { path = "core/node/fee_model" } -zksync_vm_runner = { path = "core/node/vm_runner" } -zksync_node_test_utils = { path = "core/node/test_utils" } -zksync_state_keeper = { path = "core/node/state_keeper" } -zksync_reorg_detector = { path = "core/node/reorg_detector" } -zksync_consistency_checker = { path = "core/node/consistency_checker" } -zksync_metadata_calculator = { path = "core/node/metadata_calculator" } -zksync_node_sync = { path = "core/node/node_sync" } -zksync_node_storage_init = { path = "core/node/node_storage_init" } -zksync_node_consensus = { path = "core/node/consensus" } -zksync_contract_verification_server = { path = "core/node/contract_verification_server" } -zksync_node_api_server = { path = "core/node/api_server" } -zksync_tee_verifier_input_producer = { path = "core/node/tee_verifier_input_producer" } -zksync_base_token_adjuster = { path = "core/node/base_token_adjuster" } +zksync_node_framework = { version = "0.1.0", path = "core/node/node_framework" } +zksync_node_framework_derive = { version = "0.1.0", path = "core/lib/node_framework_derive" } +zksync_eth_watch = { version = "0.1.0", path = "core/node/eth_watch" } +zksync_shared_metrics = { version = "0.1.0", path = "core/node/shared_metrics" } +zksync_proof_data_handler = { version = "0.1.0", path = "core/node/proof_data_handler" } +zksync_block_reverter = { version = "0.1.0", path = "core/node/block_reverter" } +zksync_commitment_generator = { version = "0.1.0", path = "core/node/commitment_generator" } +zksync_house_keeper = { version = "0.1.0", path = "core/node/house_keeper" } +zksync_node_genesis = { version = "0.1.0", path = "core/node/genesis" } +zksync_da_dispatcher = { version = "0.1.0", path = "core/node/da_dispatcher" } +zksync_eth_sender = { version = "0.1.0", path = "core/node/eth_sender" } +zksync_node_db_pruner = { version = "0.1.0", path = "core/node/db_pruner" } +zksync_node_fee_model = { version = "0.1.0", path = "core/node/fee_model" } +zksync_vm_runner = { version = "0.1.0", path = "core/node/vm_runner" } +zksync_node_test_utils = { version = "0.1.0", path = "core/node/test_utils" } +zksync_state_keeper = { version = "0.1.0", path = "core/node/state_keeper" } +zksync_reorg_detector = { version = "0.1.0", path = "core/node/reorg_detector" } +zksync_consistency_checker = { version = "0.1.0", path = "core/node/consistency_checker" } +zksync_metadata_calculator = { version = "0.1.0", path = "core/node/metadata_calculator" } +zksync_node_sync = { version = "0.1.0", path = "core/node/node_sync" } +zksync_node_storage_init = { version = "0.1.0", path = "core/node/node_storage_init" } +zksync_node_consensus = { version = "0.1.0", path = "core/node/consensus" } +zksync_contract_verification_server = { version = "0.1.0", path = "core/node/contract_verification_server" } +zksync_node_api_server = { version = "0.1.0", path = "core/node/api_server" } +zksync_tee_verifier_input_producer = { version = "0.1.0", path = "core/node/tee_verifier_input_producer" } +zksync_base_token_adjuster = { version = "0.1.0", path = "core/node/base_token_adjuster" } diff --git a/core/bin/block_reverter/Cargo.toml b/core/bin/block_reverter/Cargo.toml index c9499d644fe9..9ac7a49335c4 100644 --- a/core/bin/block_reverter/Cargo.toml +++ b/core/bin/block_reverter/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "block_reverter" +description = "Utility to revert blocks" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/bin/contract-verifier/Cargo.toml b/core/bin/contract-verifier/Cargo.toml index 70c036eb282f..d57b44f046cc 100644 --- a/core/bin/contract-verifier/Cargo.toml +++ b/core/bin/contract-verifier/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zksync_contract_verifier" -description = "The zkEVM contract verifier" +description = "The ZKsync contract verifier" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/bin/external_node/Cargo.toml b/core/bin/external_node/Cargo.toml index a4a45abe8c75..c083561897d2 100644 --- a/core/bin/external_node/Cargo.toml +++ b/core/bin/external_node/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_external_node" +description = "Non-validator ZKsync node" version = "24.9.0" # x-release-please-version edition.workspace = true authors.workspace = true diff --git a/core/bin/genesis_generator/Cargo.toml b/core/bin/genesis_generator/Cargo.toml index e6ac400c0ff0..1ece9ea09d2e 100644 --- a/core/bin/genesis_generator/Cargo.toml +++ b/core/bin/genesis_generator/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "genesis_generator" +description = "Tool to generate ZKsync genesis data" version.workspace = true edition.workspace = true authors.workspace = true @@ -8,8 +9,7 @@ repository.workspace = true license.workspace = true keywords.workspace = true categories.workspace = true - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +publish = false [dependencies] zksync_config.workspace = true diff --git a/core/bin/merkle_tree_consistency_checker/Cargo.toml b/core/bin/merkle_tree_consistency_checker/Cargo.toml index 9d13a2b0d199..1399faec1d42 100644 --- a/core/bin/merkle_tree_consistency_checker/Cargo.toml +++ b/core/bin/merkle_tree_consistency_checker/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "merkle_tree_consistency_checker" +description = "Tool to verify consistency of ZKsync Merkle Tree" version = "0.1.0" edition.workspace = true authors.workspace = true diff --git a/core/bin/snapshots_creator/Cargo.toml b/core/bin/snapshots_creator/Cargo.toml index 1c6f6ceeaf28..763d2374b8c2 100644 --- a/core/bin/snapshots_creator/Cargo.toml +++ b/core/bin/snapshots_creator/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "snapshots_creator" +description = "Tool to create ZKsync state snapshots" version = "0.1.0" edition.workspace = true authors.workspace = true diff --git a/core/bin/system-constants-generator/Cargo.toml b/core/bin/system-constants-generator/Cargo.toml index 6f52ed28b2d4..8632b4c554cc 100644 --- a/core/bin/system-constants-generator/Cargo.toml +++ b/core/bin/system-constants-generator/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "system-constants-generator" +description = "Tool for generating JSON files with the system constants for L1/L2 contracts" version = "0.1.0" edition.workspace = true authors.workspace = true @@ -7,7 +8,6 @@ homepage.workspace = true license.workspace = true keywords.workspace = true categories.workspace = true -description = "Tool for generating JSON files with the system constants for L1/L2 contracts" publish = false [dependencies] diff --git a/core/bin/verified_sources_fetcher/Cargo.toml b/core/bin/verified_sources_fetcher/Cargo.toml index 2d83435e9c42..5fa90590ed5f 100644 --- a/core/bin/verified_sources_fetcher/Cargo.toml +++ b/core/bin/verified_sources_fetcher/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "verified_sources_fetcher" +description = "Tool to fetch verified contract sources" version = "0.1.0" edition.workspace = true authors.workspace = true diff --git a/core/bin/zksync_server/Cargo.toml b/core/bin/zksync_server/Cargo.toml index d9b8b530247d..5470f24010c1 100644 --- a/core/bin/zksync_server/Cargo.toml +++ b/core/bin/zksync_server/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_server" +description = "ZKsync validator/sequencer node" version = "0.1.0" edition.workspace = true authors.workspace = true diff --git a/core/bin/zksync_tee_prover/Cargo.toml b/core/bin/zksync_tee_prover/Cargo.toml index e6fa61fab705..037833b1890e 100644 --- a/core/bin/zksync_tee_prover/Cargo.toml +++ b/core/bin/zksync_tee_prover/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_tee_prover" +description = "ZKsync TEE prover" version = "0.1.0" edition.workspace = true authors.workspace = true @@ -8,6 +9,7 @@ repository.workspace = true license.workspace = true keywords.workspace = true categories.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/core/lib/basic_types/Cargo.toml b/core/lib/basic_types/Cargo.toml index 937006bb2578..84411405c2a4 100644 --- a/core/lib/basic_types/Cargo.toml +++ b/core/lib/basic_types/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_basic_types" -version = "0.1.0" +description = "ZKsync primitive types" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/circuit_breaker/Cargo.toml b/core/lib/circuit_breaker/Cargo.toml index 308a9e7eaa35..9bc00b475d4a 100644 --- a/core/lib/circuit_breaker/Cargo.toml +++ b/core/lib/circuit_breaker/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_circuit_breaker" -version = "0.1.0" +description = "ZKsync circuit breakers" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/config/Cargo.toml b/core/lib/config/Cargo.toml index 551b97cc0b9b..b1a2a0ef1e8f 100644 --- a/core/lib/config/Cargo.toml +++ b/core/lib/config/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_config" -version = "0.1.0" +description = "ZKsync core configuration" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/constants/Cargo.toml b/core/lib/constants/Cargo.toml index 622ac46c3152..b741b5734902 100644 --- a/core/lib/constants/Cargo.toml +++ b/core/lib/constants/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_system_constants" -version = "0.1.0" +description = "ZKsync system constants" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/contract_verifier/Cargo.toml b/core/lib/contract_verifier/Cargo.toml index ea84024cba98..2803e3bb4185 100644 --- a/core/lib/contract_verifier/Cargo.toml +++ b/core/lib/contract_verifier/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_contract_verifier_lib" -version = "0.1.0" +description = "ZKsync contract verification utilities" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/contracts/Cargo.toml b/core/lib/contracts/Cargo.toml index eedf60b262ac..2b80295cf440 100644 --- a/core/lib/contracts/Cargo.toml +++ b/core/lib/contracts/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_contracts" -version = "0.1.0" +description = "Definitions of main ZKsync smart contracts" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/crypto/Cargo.toml b/core/lib/crypto/Cargo.toml deleted file mode 100644 index 5c81bd6b9d84..000000000000 --- a/core/lib/crypto/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "zksync_crypto" -version = "0.1.0" -edition.workspace = true -authors.workspace = true -homepage.workspace = true -repository.workspace = true -license.workspace = true -keywords.workspace = true -categories.workspace = true -readme = "README.md" - -[dependencies] -zksync_basic_types.workspace = true -serde.workspace = true -thiserror.workspace = true -once_cell.workspace = true -hex.workspace = true -sha2.workspace = true -blake2.workspace = true - -[dev-dependencies] -serde_json.workspace = true diff --git a/core/lib/crypto/README.md b/core/lib/crypto/README.md deleted file mode 100644 index 38b5a306a9bd..000000000000 --- a/core/lib/crypto/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# ZKsync crypto. Essential cryptography primitives for the ZKsync network - -`zksync_crypto` is a crate containing essential ZKsync cryptographic primitives, such as private keys and hashers. - -## License - -`zksync_crypto` is a part of ZKsync stack, which is distributed under the terms of both the MIT license and the Apache -License (Version 2.0). - -See [LICENSE-APACHE](../../../LICENSE-APACHE), [LICENSE-MIT](../../../LICENSE-MIT) for details. diff --git a/core/lib/crypto/src/lib.rs b/core/lib/crypto/src/lib.rs deleted file mode 100644 index f437e48ef7b3..000000000000 --- a/core/lib/crypto/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod hasher; diff --git a/core/lib/crypto_primitives/Cargo.toml b/core/lib/crypto_primitives/Cargo.toml index 1664c4c95bb5..7efe5279b598 100644 --- a/core/lib/crypto_primitives/Cargo.toml +++ b/core/lib/crypto_primitives/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_crypto_primitives" +description = "ZKsync core cryptographic primitives" version.workspace = true edition.workspace = true authors.workspace = true @@ -12,6 +13,8 @@ categories.workspace = true [dependencies] secp256k1 = { workspace = true, features = ["global-context"] } +sha2.workspace = true +blake2.workspace = true zksync_utils.workspace = true zksync_basic_types.workspace = true thiserror.workspace = true diff --git a/core/lib/crypto/src/hasher/blake2.rs b/core/lib/crypto_primitives/src/hasher/blake2.rs similarity index 100% rename from core/lib/crypto/src/hasher/blake2.rs rename to core/lib/crypto_primitives/src/hasher/blake2.rs diff --git a/core/lib/crypto/src/hasher/keccak.rs b/core/lib/crypto_primitives/src/hasher/keccak.rs similarity index 100% rename from core/lib/crypto/src/hasher/keccak.rs rename to core/lib/crypto_primitives/src/hasher/keccak.rs diff --git a/core/lib/crypto/src/hasher/mod.rs b/core/lib/crypto_primitives/src/hasher/mod.rs similarity index 100% rename from core/lib/crypto/src/hasher/mod.rs rename to core/lib/crypto_primitives/src/hasher/mod.rs diff --git a/core/lib/crypto/src/hasher/sha256.rs b/core/lib/crypto_primitives/src/hasher/sha256.rs similarity index 100% rename from core/lib/crypto/src/hasher/sha256.rs rename to core/lib/crypto_primitives/src/hasher/sha256.rs diff --git a/core/lib/crypto_primitives/src/lib.rs b/core/lib/crypto_primitives/src/lib.rs index db669b98c1b1..154706d40791 100644 --- a/core/lib/crypto_primitives/src/lib.rs +++ b/core/lib/crypto_primitives/src/lib.rs @@ -2,4 +2,5 @@ pub use self::{ecdsa_signature::K256PrivateKey, eip712_signature::*, packed_eth_ pub(crate) mod ecdsa_signature; pub mod eip712_signature; +pub mod hasher; pub mod packed_eth_signature; diff --git a/core/lib/da_client/Cargo.toml b/core/lib/da_client/Cargo.toml index da118058eab5..589a077d4bf9 100644 --- a/core/lib/da_client/Cargo.toml +++ b/core/lib/da_client/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_da_client" +description = "ZKsync DA client definition" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/lib/dal/Cargo.toml b/core/lib/dal/Cargo.toml index aa1d7097b9ba..c046b3d3b425 100644 --- a/core/lib/dal/Cargo.toml +++ b/core/lib/dal/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_dal" -version = "0.1.0" +description = "ZKsync data access layer" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/db_connection/Cargo.toml b/core/lib/db_connection/Cargo.toml index 795ec5ab5ac7..fa5bb0b20af2 100644 --- a/core/lib/db_connection/Cargo.toml +++ b/core/lib/db_connection/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_db_connection" -version = "0.1.0" +description = "ZKsync Postgres connection wrappers" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/default_da_clients/Cargo.toml b/core/lib/default_da_clients/Cargo.toml index c19af34681a8..737d209aed31 100644 --- a/core/lib/default_da_clients/Cargo.toml +++ b/core/lib/default_da_clients/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_default_da_clients" +description = "ZKsync DA client implementations" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/lib/env_config/Cargo.toml b/core/lib/env_config/Cargo.toml index c86621584010..31ffb8223bd1 100644 --- a/core/lib/env_config/Cargo.toml +++ b/core/lib/env_config/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_env_config" -version = "0.1.0" +description = "ZKsync env deserialization for configs" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml index 72d92f2ce48f..4daa5a729ff6 100644 --- a/core/lib/eth_client/Cargo.toml +++ b/core/lib/eth_client/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_eth_client" -version = "0.1.0" +description = "ZKsync Ethereum client implementations" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml index 866a0c158ed6..f760134e09bb 100644 --- a/core/lib/eth_signer/Cargo.toml +++ b/core/lib/eth_signer/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_eth_signer" -version = "0.1.0" +description = "ZKsync Ethereum signer" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/external_price_api/Cargo.toml b/core/lib/external_price_api/Cargo.toml index 40ff295fbced..9539aa3fdc3c 100644 --- a/core/lib/external_price_api/Cargo.toml +++ b/core/lib/external_price_api/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_external_price_api" +description = "ZKsync clients for fetching token prices" version.workspace = true edition.workspace = true authors.workspace = true @@ -16,7 +17,7 @@ url.workspace = true bigdecimal.workspace = true chrono.workspace = true serde.workspace = true -reqwest.workspace = true +reqwest = { workspace = true, features = ["json"] } fraction.workspace = true rand.workspace = true diff --git a/core/lib/health_check/Cargo.toml b/core/lib/health_check/Cargo.toml index c2d4e85d209e..6f1d863d8cec 100644 --- a/core/lib/health_check/Cargo.toml +++ b/core/lib/health_check/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_health_check" -version = "0.1.0" +description = "Health checks library" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/l1_contract_interface/Cargo.toml b/core/lib/l1_contract_interface/Cargo.toml index 56274c525f99..8b68df854e71 100644 --- a/core/lib/l1_contract_interface/Cargo.toml +++ b/core/lib/l1_contract_interface/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_l1_contract_interface" +description = "Interfaces for interacting with ZKsync contracts" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/lib/mempool/Cargo.toml b/core/lib/mempool/Cargo.toml index 25502cd1e83e..ca2203f174f6 100644 --- a/core/lib/mempool/Cargo.toml +++ b/core/lib/mempool/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_mempool" +description = "ZKsync mempool implementation" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/lib/merkle_tree/Cargo.toml b/core/lib/merkle_tree/Cargo.toml index 54c1e14e67b6..579350bccf4e 100644 --- a/core/lib/merkle_tree/Cargo.toml +++ b/core/lib/merkle_tree/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_merkle_tree" -version = "0.1.0" +description = "ZKsync implementation of Jellyfish Merkle tree" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true @@ -12,7 +13,7 @@ categories.workspace = true [dependencies] vise.workspace = true zksync_types.workspace = true -zksync_crypto.workspace = true +zksync_crypto_primitives.workspace = true zksync_storage.workspace = true zksync_prover_interface.workspace = true zksync_utils.workspace = true diff --git a/core/lib/merkle_tree/examples/loadtest/main.rs b/core/lib/merkle_tree/examples/loadtest/main.rs index 2560124842b0..6ac8425c0fc6 100644 --- a/core/lib/merkle_tree/examples/loadtest/main.rs +++ b/core/lib/merkle_tree/examples/loadtest/main.rs @@ -13,7 +13,7 @@ use clap::Parser; use rand::{rngs::StdRng, seq::IteratorRandom, SeedableRng}; use tempfile::TempDir; use tracing_subscriber::EnvFilter; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{ Database, HashTree, MerkleTree, MerkleTreePruner, PatchSet, RocksDBWrapper, TreeEntry, TreeInstruction, diff --git a/core/lib/merkle_tree/examples/recovery.rs b/core/lib/merkle_tree/examples/recovery.rs index 882bfe9d9823..113471ff9e0d 100644 --- a/core/lib/merkle_tree/examples/recovery.rs +++ b/core/lib/merkle_tree/examples/recovery.rs @@ -7,7 +7,7 @@ use clap::Parser; use rand::{rngs::StdRng, Rng, SeedableRng}; use tempfile::TempDir; use tracing_subscriber::EnvFilter; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{ recovery::MerkleTreeRecovery, HashTree, Key, MerkleTree, PatchSet, PruneDatabase, RocksDBWrapper, TreeEntry, ValueHash, diff --git a/core/lib/merkle_tree/src/domain.rs b/core/lib/merkle_tree/src/domain.rs index 37e9e0f23b53..a4d577fc3ba5 100644 --- a/core/lib/merkle_tree/src/domain.rs +++ b/core/lib/merkle_tree/src/domain.rs @@ -1,7 +1,7 @@ //! Tying the Merkle tree implementation to the problem domain. use rayon::{ThreadPool, ThreadPoolBuilder}; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_prover_interface::inputs::{StorageLogMetadata, WitnessInputMerklePaths}; use zksync_types::{L1BatchNumber, StorageKey}; diff --git a/core/lib/merkle_tree/src/hasher/mod.rs b/core/lib/merkle_tree/src/hasher/mod.rs index fa700a68244f..3e4444b3bef2 100644 --- a/core/lib/merkle_tree/src/hasher/mod.rs +++ b/core/lib/merkle_tree/src/hasher/mod.rs @@ -3,7 +3,7 @@ use std::{fmt, iter}; use once_cell::sync::Lazy; -use zksync_crypto::hasher::{blake2::Blake2Hasher, Hasher}; +use zksync_crypto_primitives::hasher::{blake2::Blake2Hasher, Hasher}; pub(crate) use self::nodes::{InternalNodeCache, MerklePath}; pub use self::proofs::TreeRangeDigest; diff --git a/core/lib/merkle_tree/src/hasher/nodes.rs b/core/lib/merkle_tree/src/hasher/nodes.rs index 6172d9088126..c652b44c6fc6 100644 --- a/core/lib/merkle_tree/src/hasher/nodes.rs +++ b/core/lib/merkle_tree/src/hasher/nodes.rs @@ -268,7 +268,7 @@ impl Root { #[cfg(test)] mod tests { - use zksync_crypto::hasher::{blake2::Blake2Hasher, Hasher}; + use zksync_crypto_primitives::hasher::{blake2::Blake2Hasher, Hasher}; use zksync_types::H256; use super::*; diff --git a/core/lib/merkle_tree/src/lib.rs b/core/lib/merkle_tree/src/lib.rs index 0e6dd7793260..6f9da59cf0ed 100644 --- a/core/lib/merkle_tree/src/lib.rs +++ b/core/lib/merkle_tree/src/lib.rs @@ -46,7 +46,7 @@ clippy::doc_markdown // frequent false positive: RocksDB )] -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; pub use crate::{ errors::NoVersionError, diff --git a/core/lib/merkle_tree/src/recovery/mod.rs b/core/lib/merkle_tree/src/recovery/mod.rs index 87a601f32f97..c208c12795a2 100644 --- a/core/lib/merkle_tree/src/recovery/mod.rs +++ b/core/lib/merkle_tree/src/recovery/mod.rs @@ -38,7 +38,7 @@ use std::{collections::HashMap, time::Instant}; use anyhow::Context as _; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; pub use crate::storage::PersistenceThreadHandle; use crate::{ diff --git a/core/lib/merkle_tree/src/storage/tests.rs b/core/lib/merkle_tree/src/storage/tests.rs index 8656c471905e..accf2d2de10e 100644 --- a/core/lib/merkle_tree/src/storage/tests.rs +++ b/core/lib/merkle_tree/src/storage/tests.rs @@ -7,7 +7,7 @@ use rand::{ Rng, SeedableRng, }; use test_casing::test_casing; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_types::{H256, U256}; use super::*; diff --git a/core/lib/merkle_tree/tests/integration/common.rs b/core/lib/merkle_tree/tests/integration/common.rs index 28c3827827a9..453fd1f05bda 100644 --- a/core/lib/merkle_tree/tests/integration/common.rs +++ b/core/lib/merkle_tree/tests/integration/common.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use once_cell::sync::Lazy; -use zksync_crypto::hasher::{blake2::Blake2Hasher, Hasher}; +use zksync_crypto_primitives::hasher::{blake2::Blake2Hasher, Hasher}; use zksync_merkle_tree::{HashTree, TreeEntry, TreeInstruction}; use zksync_types::{AccountTreeId, Address, StorageKey, H256, U256}; diff --git a/core/lib/merkle_tree/tests/integration/domain.rs b/core/lib/merkle_tree/tests/integration/domain.rs index 85b761f7b4b8..abd3dbbcd3f3 100644 --- a/core/lib/merkle_tree/tests/integration/domain.rs +++ b/core/lib/merkle_tree/tests/integration/domain.rs @@ -5,7 +5,7 @@ use std::slice; use serde::{Deserialize, Serialize}; use serde_with::{hex::Hex, serde_as}; use tempfile::TempDir; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{domain::ZkSyncTree, HashTree, TreeEntry, TreeInstruction}; use zksync_prover_interface::inputs::StorageLogMetadata; use zksync_storage::RocksDB; diff --git a/core/lib/merkle_tree/tests/integration/merkle_tree.rs b/core/lib/merkle_tree/tests/integration/merkle_tree.rs index a83b982cc497..fc26cafe9ba7 100644 --- a/core/lib/merkle_tree/tests/integration/merkle_tree.rs +++ b/core/lib/merkle_tree/tests/integration/merkle_tree.rs @@ -4,7 +4,7 @@ use std::{cmp, mem}; use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng}; use test_casing::test_casing; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{ Database, HashTree, MerkleTree, PatchSet, Patched, TreeEntry, TreeInstruction, TreeLogEntry, TreeRangeDigest, diff --git a/core/lib/merkle_tree/tests/integration/recovery.rs b/core/lib/merkle_tree/tests/integration/recovery.rs index 0bed36185d7c..f7ee2d154394 100644 --- a/core/lib/merkle_tree/tests/integration/recovery.rs +++ b/core/lib/merkle_tree/tests/integration/recovery.rs @@ -2,7 +2,7 @@ use rand::{rngs::StdRng, seq::SliceRandom, SeedableRng}; use test_casing::test_casing; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{ recovery::MerkleTreeRecovery, Database, MerkleTree, PatchSet, PruneDatabase, ValueHash, }; diff --git a/core/lib/mini_merkle_tree/Cargo.toml b/core/lib/mini_merkle_tree/Cargo.toml index d4cccbda6d3e..1a8744318039 100644 --- a/core/lib/mini_merkle_tree/Cargo.toml +++ b/core/lib/mini_merkle_tree/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_mini_merkle_tree" -version = "0.1.0" +description = "ZKsync implementation of small Merkle trees" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true @@ -10,7 +11,7 @@ keywords.workspace = true categories.workspace = true [dependencies] -zksync_crypto.workspace = true +zksync_crypto_primitives.workspace = true zksync_basic_types.workspace = true once_cell.workspace = true diff --git a/core/lib/mini_merkle_tree/src/lib.rs b/core/lib/mini_merkle_tree/src/lib.rs index 3d4ff3cf561c..d34f57999961 100644 --- a/core/lib/mini_merkle_tree/src/lib.rs +++ b/core/lib/mini_merkle_tree/src/lib.rs @@ -13,7 +13,7 @@ use once_cell::sync::OnceCell; mod tests; use zksync_basic_types::H256; -use zksync_crypto::hasher::{keccak::KeccakHasher, Hasher}; +use zksync_crypto_primitives::hasher::{keccak::KeccakHasher, Hasher}; /// Maximum supported depth of the tree. 32 corresponds to `2^32` elements in the tree, which /// we unlikely to ever hit. diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml index 0555a3e8961d..5e5440ff9407 100644 --- a/core/lib/multivm/Cargo.toml +++ b/core/lib/multivm/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_multivm" -version = "0.1.0" +description = "ZKsync out-of-circuit VM" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/node_framework_derive/Cargo.toml b/core/lib/node_framework_derive/Cargo.toml index 3b3198545298..0d3c69a3e591 100644 --- a/core/lib/node_framework_derive/Cargo.toml +++ b/core/lib/node_framework_derive/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_node_framework_derive" +description = "Derive macro for ZKsync node framework" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/lib/object_store/Cargo.toml b/core/lib/object_store/Cargo.toml index e400642bd2cd..1c75d6d0f922 100644 --- a/core/lib/object_store/Cargo.toml +++ b/core/lib/object_store/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_object_store" -version = "0.1.0" +description = "ZKsync implementation of object stores" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/protobuf_config/Cargo.toml b/core/lib/protobuf_config/Cargo.toml index ee52d8d5472f..453d5ab65f69 100644 --- a/core/lib/protobuf_config/Cargo.toml +++ b/core/lib/protobuf_config/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_protobuf_config" -version = "0.1.0" +description = "Protobuf deserialization for ZKsync configs" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/prover_interface/Cargo.toml b/core/lib/prover_interface/Cargo.toml index f61cc3ac9b78..89e402b27759 100644 --- a/core/lib/prover_interface/Cargo.toml +++ b/core/lib/prover_interface/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_prover_interface" -version = "0.1.0" +description = "Interfaces for interaction with ZKsync prover subsystem" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/queued_job_processor/Cargo.toml b/core/lib/queued_job_processor/Cargo.toml index 68817cb6e4ce..f71251541299 100644 --- a/core/lib/queued_job_processor/Cargo.toml +++ b/core/lib/queued_job_processor/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_queued_job_processor" -version = "0.1.0" +description = "Abstract queued job processor" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/snapshots_applier/Cargo.toml b/core/lib/snapshots_applier/Cargo.toml index a293b7714b94..4ab0c86843ef 100644 --- a/core/lib/snapshots_applier/Cargo.toml +++ b/core/lib/snapshots_applier/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_snapshots_applier" -version = "0.1.0" +description = "Library for applying ZKsync state snapshots" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/state/Cargo.toml b/core/lib/state/Cargo.toml index b7d5a4cfe0f2..119bc800b800 100644 --- a/core/lib/state/Cargo.toml +++ b/core/lib/state/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_state" -version = "0.1.0" +description = "ZKsync state keeper state" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/storage/Cargo.toml b/core/lib/storage/Cargo.toml index b04b4524ddd7..8c704476ce41 100644 --- a/core/lib/storage/Cargo.toml +++ b/core/lib/storage/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_storage" -version = "0.1.0" +description = "ZKsync RocksDB storage interfaces" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/tee_verifier/Cargo.toml b/core/lib/tee_verifier/Cargo.toml index ed222565a1a3..0d50684e165d 100644 --- a/core/lib/tee_verifier/Cargo.toml +++ b/core/lib/tee_verifier/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_tee_verifier" -version = "0.1.0" +description = "ZKsync library for TEE verification" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true @@ -9,8 +10,6 @@ license.workspace = true keywords.workspace = true categories.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] anyhow.workspace = true zksync_multivm.workspace = true @@ -18,7 +17,7 @@ serde.workspace = true tracing.workspace = true zksync_vm_utils.workspace = true zksync_config.workspace = true -zksync_crypto.workspace = true +zksync_crypto_primitives.workspace = true zksync_dal.workspace = true zksync_db_connection.workspace = true zksync_merkle_tree.workspace = true diff --git a/core/lib/tee_verifier/src/lib.rs b/core/lib/tee_verifier/src/lib.rs index e4adbd37f340..b69b295130d1 100644 --- a/core/lib/tee_verifier/src/lib.rs +++ b/core/lib/tee_verifier/src/lib.rs @@ -7,7 +7,7 @@ use std::{cell::RefCell, rc::Rc}; use anyhow::Context; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{ BlockOutputWithProofs, TreeInstruction, TreeLogEntry, TreeLogEntryWithProof, ValueHash, }; diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml index 673a0f35a26a..c80f304a75a6 100644 --- a/core/lib/types/Cargo.toml +++ b/core/lib/types/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_types" -version = "0.1.0" +description = "Shared ZKsync types" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/utils/Cargo.toml b/core/lib/utils/Cargo.toml index 9ab2041bef98..5ec27380df5b 100644 --- a/core/lib/utils/Cargo.toml +++ b/core/lib/utils/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_utils" -version = "0.1.0" +description = "ZKsync utilities" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/vlog/Cargo.toml b/core/lib/vlog/Cargo.toml index eec87a50dfcd..17f0e88b8c84 100644 --- a/core/lib/vlog/Cargo.toml +++ b/core/lib/vlog/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_vlog" -version = "0.1.0" +description = "ZKsync observability stack" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/vm_utils/Cargo.toml b/core/lib/vm_utils/Cargo.toml index 632813d55e6a..c325f0e9db30 100644 --- a/core/lib/vm_utils/Cargo.toml +++ b/core/lib/vm_utils/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_vm_utils" -version = "0.1.0" +description = "ZKsync VM utilities" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/web3_decl/Cargo.toml b/core/lib/web3_decl/Cargo.toml index dcae39a73c84..50073e357eb4 100644 --- a/core/lib/web3_decl/Cargo.toml +++ b/core/lib/web3_decl/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_web3_decl" -version = "0.1.0" +description = "ZKsync Web3 API abstractions and clients" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/lib/zksync_core_leftovers/Cargo.toml b/core/lib/zksync_core_leftovers/Cargo.toml index b86c8d55c49e..4eab88234749 100644 --- a/core/lib/zksync_core_leftovers/Cargo.toml +++ b/core/lib/zksync_core_leftovers/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_core_leftovers" -version = "0.1.0" +description = "Deprecated package" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/api_server/Cargo.toml b/core/node/api_server/Cargo.toml index 9a026846f003..2a09ce5d176c 100644 --- a/core/node/api_server/Cargo.toml +++ b/core/node/api_server/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_node_api_server" -version = "0.1.0" +description = "ZKsync API server" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/base_token_adjuster/Cargo.toml b/core/node/base_token_adjuster/Cargo.toml index 34a38b2bbf77..812cacaa1f73 100644 --- a/core/node/base_token_adjuster/Cargo.toml +++ b/core/node/base_token_adjuster/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_base_token_adjuster" +description = "ZKsync base token adjuster" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/block_reverter/Cargo.toml b/core/node/block_reverter/Cargo.toml index 68fdf72acd83..b61d14abccbc 100644 --- a/core/node/block_reverter/Cargo.toml +++ b/core/node/block_reverter/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_block_reverter" -version = "0.1.0" +description = "ZKsync block reverter library" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/commitment_generator/Cargo.toml b/core/node/commitment_generator/Cargo.toml index c43343e3614a..a88b494a7d86 100644 --- a/core/node/commitment_generator/Cargo.toml +++ b/core/node/commitment_generator/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_commitment_generator" -version = "0.1.0" +description = "ZKsync commitment generator" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/consensus/Cargo.toml b/core/node/consensus/Cargo.toml index 6332ac8c1a9d..68fffa56dcbc 100644 --- a/core/node/consensus/Cargo.toml +++ b/core/node/consensus/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_node_consensus" -version = "0.1.0" +description = "Consensus integration for ZKsync node" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/consistency_checker/Cargo.toml b/core/node/consistency_checker/Cargo.toml index 41fe90fabe27..769690b493a4 100644 --- a/core/node/consistency_checker/Cargo.toml +++ b/core/node/consistency_checker/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_consistency_checker" -version = "0.1.0" +description = "Consistency checker for ZKsync network" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/contract_verification_server/Cargo.toml b/core/node/contract_verification_server/Cargo.toml index ee38d30906fb..eeb2c7828467 100644 --- a/core/node/contract_verification_server/Cargo.toml +++ b/core/node/contract_verification_server/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_contract_verification_server" -version = "0.1.0" +description = "ZKsync contract verification server" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true @@ -18,7 +19,7 @@ vise.workspace = true anyhow.workspace = true axum.workspace = true tokio = { workspace = true, features = ["time"] } -tower-http.workspace = true +tower-http = { workspace = true, features = ["cors"] } tracing.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/core/node/da_dispatcher/Cargo.toml b/core/node/da_dispatcher/Cargo.toml index 159c8f40ef47..8a10d6813a5a 100644 --- a/core/node/da_dispatcher/Cargo.toml +++ b/core/node/da_dispatcher/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_da_dispatcher" +description = "ZKsync data availability dispatcher" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/db_pruner/Cargo.toml b/core/node/db_pruner/Cargo.toml index d56d9fb4df55..eb21e3e476db 100644 --- a/core/node/db_pruner/Cargo.toml +++ b/core/node/db_pruner/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_node_db_pruner" +description = "ZKsync database pruner" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/eth_sender/Cargo.toml b/core/node/eth_sender/Cargo.toml index c957ae2ce46b..4f2b27ff1d9f 100644 --- a/core/node/eth_sender/Cargo.toml +++ b/core/node/eth_sender/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_eth_sender" +description = "ZKsync Ethereum sender" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/eth_watch/Cargo.toml b/core/node/eth_watch/Cargo.toml index 4e85d1332603..bbdc4ba27d34 100644 --- a/core/node/eth_watch/Cargo.toml +++ b/core/node/eth_watch/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_eth_watch" -version = "0.1.0" +description = "ZKsync Ethereum watcher" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/fee_model/Cargo.toml b/core/node/fee_model/Cargo.toml index 006a2c22da7e..643e87b9c27e 100644 --- a/core/node/fee_model/Cargo.toml +++ b/core/node/fee_model/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_node_fee_model" +description = "ZKsync fee model" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/genesis/Cargo.toml b/core/node/genesis/Cargo.toml index c9d554770338..71c4c45e9e38 100644 --- a/core/node/genesis/Cargo.toml +++ b/core/node/genesis/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_node_genesis" +description = "ZKsync node genesis tools" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/house_keeper/Cargo.toml b/core/node/house_keeper/Cargo.toml index 66bdca149a2e..ed86a713ea25 100644 --- a/core/node/house_keeper/Cargo.toml +++ b/core/node/house_keeper/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_house_keeper" -version = "0.1.0" +description = "ZKsync house keeper" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/metadata_calculator/Cargo.toml b/core/node/metadata_calculator/Cargo.toml index b694c1d198cd..5b566c09ff68 100644 --- a/core/node/metadata_calculator/Cargo.toml +++ b/core/node/metadata_calculator/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_metadata_calculator" -version = "0.1.0" +description = "ZKsync batch metadata calculator" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true @@ -10,7 +11,7 @@ keywords.workspace = true categories.workspace = true [dependencies] -zksync_crypto.workspace = true +zksync_crypto_primitives.workspace = true zksync_dal.workspace = true zksync_health_check.workspace = true zksync_merkle_tree.workspace = true diff --git a/core/node/metadata_calculator/src/api_server/mod.rs b/core/node/metadata_calculator/src/api_server/mod.rs index de3d39a14098..c81e2ba74544 100644 --- a/core/node/metadata_calculator/src/api_server/mod.rs +++ b/core/node/metadata_calculator/src/api_server/mod.rs @@ -12,7 +12,7 @@ use axum::{ }; use serde::{Deserialize, Serialize}; use tokio::sync::watch; -use zksync_crypto::hasher::blake2::Blake2Hasher; +use zksync_crypto_primitives::hasher::blake2::Blake2Hasher; use zksync_health_check::{CheckHealth, Health, HealthStatus}; use zksync_merkle_tree::NoVersionError; use zksync_types::{L1BatchNumber, H256, U256}; diff --git a/core/node/node_framework/Cargo.toml b/core/node/node_framework/Cargo.toml index b6a4bd227b4f..640000c6a7d8 100644 --- a/core/node/node_framework/Cargo.toml +++ b/core/node/node_framework/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_node_framework" -version = "0.1.0" +description = "ZKsync node framework" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/node_storage_init/Cargo.toml b/core/node/node_storage_init/Cargo.toml index b3fdefbfbe60..3a1e8b291156 100644 --- a/core/node/node_storage_init/Cargo.toml +++ b/core/node/node_storage_init/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_node_storage_init" -version = "0.1.0" +description = "ZKsync node storage initialization" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/node_sync/Cargo.toml b/core/node/node_sync/Cargo.toml index 7d97bdf053ac..5f1ae04c5f50 100644 --- a/core/node/node_sync/Cargo.toml +++ b/core/node/node_sync/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_node_sync" -version = "0.1.0" +description = "ZKsync node synchronization utilities" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/proof_data_handler/Cargo.toml b/core/node/proof_data_handler/Cargo.toml index 92e6b45f6fa5..31a0e8437ba5 100644 --- a/core/node/proof_data_handler/Cargo.toml +++ b/core/node/proof_data_handler/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_proof_data_handler" -version = "0.1.0" +description = "ZKsync proof data handler API" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/reorg_detector/Cargo.toml b/core/node/reorg_detector/Cargo.toml index 75e2eb3c0ece..e3e4834e90bb 100644 --- a/core/node/reorg_detector/Cargo.toml +++ b/core/node/reorg_detector/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_reorg_detector" -version = "0.1.0" +description = "ZKsync reorg detector" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/shared_metrics/Cargo.toml b/core/node/shared_metrics/Cargo.toml index 5fbbf16a2ec7..f30a2ba35334 100644 --- a/core/node/shared_metrics/Cargo.toml +++ b/core/node/shared_metrics/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_shared_metrics" -version = "0.1.0" +description = "ZKsync shared metrics" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/state_keeper/Cargo.toml b/core/node/state_keeper/Cargo.toml index 9a662affb945..904d17718503 100644 --- a/core/node/state_keeper/Cargo.toml +++ b/core/node/state_keeper/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_state_keeper" -version = "0.1.0" +description = "ZKsync state keeper" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/tee_verifier_input_producer/Cargo.toml b/core/node/tee_verifier_input_producer/Cargo.toml index 1cad743c41b1..c975bbcd280a 100644 --- a/core/node/tee_verifier_input_producer/Cargo.toml +++ b/core/node/tee_verifier_input_producer/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "zksync_tee_verifier_input_producer" -version = "0.1.0" +description = "ZKsync TEE verifier input producer" +version.workspace = true edition.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/node/test_utils/Cargo.toml b/core/node/test_utils/Cargo.toml index 78205337c549..af60008df570 100644 --- a/core/node/test_utils/Cargo.toml +++ b/core/node/test_utils/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_node_test_utils" +description = "ZKsync utilities for writing tests" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/core/node/vm_runner/Cargo.toml b/core/node/vm_runner/Cargo.toml index f11fdce357c6..3af52ed4688e 100644 --- a/core/node/vm_runner/Cargo.toml +++ b/core/node/vm_runner/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_vm_runner" +description = "ZKsync VM runner" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 5bc006faa457..a7df00e50da3 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -7902,29 +7902,18 @@ dependencies = [ "zksync_protobuf_config", ] -[[package]] -name = "zksync_crypto" -version = "0.1.0" -dependencies = [ - "blake2 0.10.6", - "hex", - "once_cell", - "serde", - "sha2 0.10.8", - "thiserror", - "zksync_basic_types", -] - [[package]] name = "zksync_crypto_primitives" version = "0.1.0" dependencies = [ "anyhow", + "blake2 0.10.6", "hex", "rand 0.8.5", "secp256k1", "serde", "serde_json", + "sha2 0.10.8", "thiserror", "zksync_basic_types", "zksync_utils", @@ -8059,7 +8048,7 @@ dependencies = [ "thread_local", "tracing", "vise", - "zksync_crypto", + "zksync_crypto_primitives", "zksync_prover_interface", "zksync_storage", "zksync_types", @@ -8072,7 +8061,7 @@ version = "0.1.0" dependencies = [ "once_cell", "zksync_basic_types", - "zksync_crypto", + "zksync_crypto_primitives", ] [[package]] diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 4e6d7791f056..6eebafbc520f 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -3,7 +3,6 @@ members = [ # lib "prover_fri_utils", "prover_fri_types", - "prover_dal", # binaries "witness_generator", "vk_setup_data_generator_server_fri", diff --git a/prover/prover_dal/Cargo.toml b/prover/prover_dal/Cargo.toml index 7f6b6f0116ce..746bb69b0f3c 100644 --- a/prover/prover_dal/Cargo.toml +++ b/prover/prover_dal/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zksync_prover_dal" +description = "ZKsync prover DAL" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/zk_toolbox/Cargo.lock b/zk_toolbox/Cargo.lock index 253e7b890974..769b2af8e44c 100644 --- a/zk_toolbox/Cargo.lock +++ b/zk_toolbox/Cargo.lock @@ -6417,29 +6417,18 @@ dependencies = [ "zksync_utils", ] -[[package]] -name = "zksync_crypto" -version = "0.1.0" -dependencies = [ - "blake2", - "hex", - "once_cell", - "serde", - "sha2", - "thiserror", - "zksync_basic_types", -] - [[package]] name = "zksync_crypto_primitives" version = "0.1.0" dependencies = [ "anyhow", + "blake2", "hex", "rand", "secp256k1", "serde", "serde_json", + "sha2", "thiserror", "zksync_basic_types", "zksync_utils", @@ -6451,7 +6440,7 @@ version = "0.1.0" dependencies = [ "once_cell", "zksync_basic_types", - "zksync_crypto", + "zksync_crypto_primitives", ] [[package]]