From 669efd9b195b690d8aeafe54d0f3aba92eba134d Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Sat, 12 Oct 2024 19:46:30 +0200 Subject: [PATCH] Deps: Build layer 1 binaries against rustzcash only `rust_deps` was introduced to fix a real issue: avoid duplicated symbols of the Rust standard library. Unfortunately, it did so by putting every Rust dependency we have in a single foreign archive. In practice, it means building every Rust dependency when building any binary. An infamous byproduct of this is Wasmer being a direct dependency of basically everything in our git repository, even though it is only useful for Layer 2 daemons like the EVM node and the Smart Rollup node. In practice, all if not most our binaries only depends on rustzcash. As a consequence, we introduce `rustzcash_deps` as an alternative foreign archive binaries can be linked against. This enable building the `octez-node` without having to build the `rust_deps`. Another example: RISC-V MRs will no longer have an impact on the `octez-node`. For some reasons, the DAL and DAC nodes still requires to be linked against `octez_rust_deps`. It is not clear why, and should be investigated in a follow-up. (To be clear: this should only have an impact on build time, not the size of the resulting binary. As far as we can tell, OCaml already does a pretty good job in eliminating dead code from foreign archives. --- .gitlab/ci/pipelines/before_merging.yml | 1 + .gitlab/ci/pipelines/merge_train.yml | 1 + .../ci/pipelines/schedule_extended_test.yml | 1 + brassaia/test/brassaia-mem/dune | 1 - brassaia/test/brassaia-pack/dune | 1 - brassaia/test/brassaia-tezos/dune | 1 - brassaia/test/brassaia/data/dune | 1 - brassaia/test/brassaia/dune | 1 - brassaia/test/brassaia/generic-key/dune | 1 - brassaia/test/dune | 1 - contrib/octez_injector_server/dune | 2 +- devtools/get_contracts/dune | 2 +- devtools/proto_context_du/dune | 2 +- devtools/testnet_experiment_tools/dune | 10 +- devtools/yes_wallet/dune | 2 +- docs/doc_gen/dune | 2 +- docs/doc_gen/errors/dune | 2 +- dune-project | 1 + irmin/test/dune | 1 - irmin/test/irmin-mem/dune | 1 - irmin/test/irmin-pack/dune | 1 - irmin/test/irmin-tezos/dune | 1 - irmin/test/irmin/data/dune | 1 - irmin/test/irmin/dune | 1 - irmin/test/irmin/generic-key/dune | 1 - manifest/product_octez.ml | 163 +- opam/bls12-381.opam | 1 - opam/internal-devtools_proto-context-du.opam | 2 +- opam/octez-accuser-PsParisC.opam | 2 +- opam/octez-accuser-PsQuebec.opam | 2 +- opam/octez-accuser-alpha.opam | 2 +- opam/octez-agnostic-baker.opam | 2 +- opam/octez-baker-PsParisC.opam | 2 +- opam/octez-baker-PsQuebec.opam | 2 +- opam/octez-baker-alpha.opam | 2 +- opam/octez-client.opam | 2 +- opam/octez-codec.opam | 2 +- opam/octez-dac-client.opam | 2 +- opam/octez-injector-server.opam | 2 +- opam/octez-libs.opam | 2 +- opam/octez-node.opam | 2 +- opam/octez-proto-libs.opam | 1 - opam/octez-protocol-009-PsFLoren-libs.opam | 2 +- opam/octez-protocol-010-PtGRANAD-libs.opam | 2 +- opam/octez-protocol-011-PtHangz2-libs.opam | 2 +- opam/octez-protocol-012-Psithaca-libs.opam | 2 +- opam/octez-protocol-013-PtJakart-libs.opam | 2 +- opam/octez-protocol-014-PtKathma-libs.opam | 2 +- opam/octez-protocol-015-PtLimaPt-libs.opam | 2 +- opam/octez-protocol-016-PtMumbai-libs.opam | 1 + opam/octez-protocol-017-PtNairob-libs.opam | 1 + opam/octez-protocol-018-Proxford-libs.opam | 1 + opam/octez-protocol-019-PtParisB-libs.opam | 1 + opam/octez-protocol-020-PsParisC-libs.opam | 1 + opam/octez-protocol-021-PsQuebec-libs.opam | 1 + opam/octez-protocol-alpha-libs.opam | 1 + opam/octez-riscv-pvm-test.opam | 2 +- opam/octez-rustzcash-deps.opam | 19 + opam/octez-shell-libs.opam | 2 +- opam/octez-shell-tests.opam | 2 +- opam/octez-signer.opam | 2 +- opam/octez-snoop.opam | 2 +- opam/octez-store-tests.opam | 2 +- opam/tezos-benchmark-020-PsParisC.opam | 2 +- opam/tezos-benchmark-021-PsQuebec.opam | 2 +- opam/tezos-benchmark-alpha.opam | 2 +- opam/tezos-benchmark-tests.opam | 1 - ...benchmark-type-inference-020-PsParisC.opam | 2 +- ...benchmark-type-inference-021-PsQuebec.opam | 2 +- .../tezos-benchmark-type-inference-alpha.opam | 2 +- opam/tezos-lazy-containers-tests.opam | 1 - opam/tezos-micheline-rewriting.opam | 2 +- opam/tezos-protocol-011-PtHangz2.opam | 2 +- opam/tezos-protocol-012-Psithaca.opam | 2 +- opam/tezos-protocol-013-PtJakart.opam | 2 +- opam/tezos-protocol-014-PtKathma.opam | 2 +- opam/tezos-protocol-015-PtLimaPt.opam | 2 +- opam/tezos-protocol-016-PtMumbai.opam | 2 +- opam/tezos-protocol-017-PtNairob.opam | 2 +- opam/tezos-protocol-018-Proxford.opam | 2 +- opam/tezos-protocol-019-PtParisB.opam | 2 +- opam/tezos-protocol-020-PsParisC-tests.opam | 3 +- opam/tezos-protocol-020-PsParisC.opam | 2 +- opam/tezos-protocol-021-PsQuebec-tests.opam | 3 +- opam/tezos-protocol-021-PsQuebec.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 3 +- opam/tezos-protocol-alpha.opam | 2 +- opam/tezos-sc-rollup-node-test.opam | 2 +- opam/tezos-scoru-wasm-regressions.opam | 2 +- opam/tezos-smart-rollup-node-lib-test.opam | 2 +- opam/tezos-tps-evaluation.opam | 2 +- opam/tezos-tree-encoding-test.opam | 1 - opam/tezos_internal_brassaia_tests.opam | 1 - opam/tezos_internal_irmin_tests.opam | 1 - opam/tezt-tezos.opam | 1 - script-inputs/ci-opam-package-tests | 1 + src/bin_agnostic_baker/dune | 2 +- src/bin_client/dune | 2 +- src/bin_codec/dune | 2 +- src/bin_dac_client/dune | 2 +- src/bin_node/dune | 2 +- src/bin_signer/dune | 2 +- src/bin_snoop/dune | 2 +- src/bin_tps_evaluation/dune | 2 +- src/lib_base/test/dune | 1 - src/lib_base/unix/test/dune | 1 - .../lib_micheline_rewriting/test/dune | 2 +- src/lib_benchmark/test/dune | 1 - src/lib_bls12_381/test/dune | 1 - src/lib_bls12_381_hash/test/dune | 1 - src/lib_bls12_381_polynomial/test/dune | 1 - src/lib_bls12_381_signature/test/dune | 1 - src/lib_clic/test/dune | 1 - src/lib_client_base/test/dune | 2 +- src/lib_client_base_unix/test/dune | 2 +- src/lib_context/memory/test/dune | 1 - src/lib_context/test/dune | 1 - src/lib_crypto/test-unix/dune | 1 - src/lib_crypto/test/dune | 1 - src/lib_crypto_dal/test/dune | 1 - src/lib_gossipsub/test/dune | 1 - src/lib_layer2_store/test/dune | 2 +- src/lib_lazy_containers/test/dune | 1 - src/lib_mec/test/dune | 1 - src/lib_mockup/test/dune | 2 +- src/lib_p2p/tezt/dune | 1 - src/lib_polynomial/test/dune | 1 - src/lib_protocol_environment/test/dune | 1 - .../test_shell_context/dune | 1 - src/lib_proxy/test/dune | 2 +- .../test_helpers/shell_services/test/dune | 1 - src/lib_requester/test/dune | 1 - src/lib_riscv/pvm/test/dune | 2 +- src/lib_rpc_http/test/dune | 1 - src/lib_sapling/dune | 2 +- src/lib_sapling/test/dune | 2 +- src/lib_scoru_wasm/fast/test/dune | 2 +- src/lib_scoru_wasm/regressions/dune | 2 +- src/lib_scoru_wasm/test/dune | 2 +- src/lib_shell/dune | 5 +- src/lib_shell/test/dune | 2 +- src/lib_shell_services/test/dune | 1 - src/lib_signer_backends/test/dune | 2 +- src/lib_signer_backends/unix/test/dune | 2 +- src/lib_smart_rollup_node/test/dune | 2 +- src/lib_srs_extraction/test/dune | 1 - src/lib_stdlib_unix/test/dune | 1 - src/lib_store/unix/test/dune | 2 +- src/lib_tree_encoding/test/dune | 1 - src/lib_version/test/dune | 1 - src/lib_wasmer/test/dune | 2 +- src/lib_webassembly/tests/dune | 1 - src/lib_workers/test/dune | 1 - src/proto_009_PsFLoren/lib_client/dune | 5 +- src/proto_010_PtGRANAD/lib_client/dune | 5 +- src/proto_011_PtHangz2/lib_client/dune | 5 +- src/proto_011_PtHangz2/lib_parameters/dune | 2 +- src/proto_012_Psithaca/lib_client/dune | 5 +- src/proto_012_Psithaca/lib_parameters/dune | 2 +- src/proto_013_PtJakart/lib_client/dune | 5 +- src/proto_013_PtJakart/lib_parameters/dune | 2 +- src/proto_014_PtKathma/lib_client/dune | 5 +- src/proto_014_PtKathma/lib_parameters/dune | 2 +- src/proto_015_PtLimaPt/lib_client/dune | 5 +- src/proto_015_PtLimaPt/lib_parameters/dune | 2 +- src/proto_016_PtMumbai/lib_client/dune | 5 +- src/proto_016_PtMumbai/lib_layer2_utils/dune | 5 +- src/proto_016_PtMumbai/lib_parameters/dune | 2 +- src/proto_017_PtNairob/lib_client/dune | 5 +- src/proto_017_PtNairob/lib_layer2_utils/dune | 5 +- src/proto_017_PtNairob/lib_parameters/dune | 2 +- src/proto_018_Proxford/lib_client/dune | 5 +- src/proto_018_Proxford/lib_layer2_utils/dune | 5 +- src/proto_018_Proxford/lib_parameters/dune | 2 +- src/proto_019_PtParisB/lib_client/dune | 5 +- src/proto_019_PtParisB/lib_layer2_utils/dune | 5 +- src/proto_019_PtParisB/lib_parameters/dune | 2 +- src/proto_020_PsParisC/bin_accuser/dune | 2 +- src/proto_020_PsParisC/bin_baker/dune | 2 +- .../lib_benchmark_type_inference/test/dune | 2 +- .../lib_benchmark/test/dune | 2 +- src/proto_020_PsParisC/lib_client/dune | 5 +- src/proto_020_PsParisC/lib_client/test/dune | 2 +- src/proto_020_PsParisC/lib_dac_plugin/dune | 5 +- src/proto_020_PsParisC/lib_dal/dune | 5 +- src/proto_020_PsParisC/lib_dal/test/dune | 2 +- src/proto_020_PsParisC/lib_delegate/test/dune | 2 +- .../lib_delegate/test/tenderbrute/dune | 2 +- src/proto_020_PsParisC/lib_layer2_utils/dune | 5 +- src/proto_020_PsParisC/lib_parameters/dune | 2 +- src/proto_020_PsParisC/lib_plugin/test/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../lib_protocol/test/integration/gas/dune | 2 +- .../test/integration/michelson/dune | 2 +- .../test/integration/operations/dune | 2 +- .../test/integration/validate/dune | 2 +- .../lib_protocol/test/pbt/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../lib_sc_rollup_node/test/dune | 2 +- src/proto_021_PsQuebec/bin_accuser/dune | 2 +- src/proto_021_PsQuebec/bin_baker/dune | 2 +- .../lib_benchmark_type_inference/test/dune | 2 +- .../lib_benchmark/test/dune | 2 +- src/proto_021_PsQuebec/lib_client/dune | 5 +- src/proto_021_PsQuebec/lib_client/test/dune | 2 +- src/proto_021_PsQuebec/lib_dac_plugin/dune | 5 +- src/proto_021_PsQuebec/lib_dal/dune | 5 +- src/proto_021_PsQuebec/lib_dal/test/dune | 2 +- src/proto_021_PsQuebec/lib_delegate/test/dune | 2 +- .../lib_delegate/test/tenderbrute/dune | 2 +- src/proto_021_PsQuebec/lib_layer2_utils/dune | 5 +- src/proto_021_PsQuebec/lib_parameters/dune | 2 +- src/proto_021_PsQuebec/lib_plugin/test/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../lib_protocol/test/integration/gas/dune | 2 +- .../test/integration/michelson/dune | 2 +- .../test/integration/operations/dune | 2 +- .../test/integration/validate/dune | 2 +- .../lib_protocol/test/pbt/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../lib_sc_rollup_node/test/dune | 2 +- src/proto_alpha/bin_accuser/dune | 2 +- src/proto_alpha/bin_baker/dune | 2 +- .../lib_benchmark_type_inference/test/dune | 2 +- src/proto_alpha/lib_benchmark/test/dune | 2 +- src/proto_alpha/lib_client/dune | 5 +- src/proto_alpha/lib_client/test/dune | 2 +- src/proto_alpha/lib_dac_plugin/dune | 5 +- src/proto_alpha/lib_dal/dune | 5 +- src/proto_alpha/lib_dal/test/dune | 2 +- src/proto_alpha/lib_delegate/test/dune | 2 +- .../lib_delegate/test/tenderbrute/dune | 2 +- src/proto_alpha/lib_layer2_utils/dune | 5 +- src/proto_alpha/lib_parameters/dune | 2 +- src/proto_alpha/lib_plugin/test/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../lib_protocol/test/integration/gas/dune | 2 +- .../test/integration/michelson/dune | 2 +- .../test/integration/operations/dune | 2 +- .../test/integration/validate/dune | 2 +- src/proto_alpha/lib_protocol/test/pbt/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- src/proto_alpha/lib_protocol/test/unit/dune | 2 +- src/proto_alpha/lib_sc_rollup_node/test/dune | 2 +- src/rust_deps/Cargo.lock | 67 +- src/rust_deps/Cargo.toml | 2 +- src/rust_deps/dune | 2 +- src/rustzcash_deps/.cargo/config.toml | 5 + src/rustzcash_deps/Cargo.lock | 2554 +++++++++++++++++ .../Cargo.toml | 2 +- .../librustzcash => rustzcash_deps}/README.md | 0 .../bin/wallet_tool.rs | 0 src/rustzcash_deps/build.sh | 31 + src/rustzcash_deps/dune | 23 + .../include/librustzcash.h | 0 .../include/rust/VA_OPT.hpp | 0 .../include/rust/address.h | 0 .../include/rust/blake2b.h | 0 .../include/rust/builder.h | 0 .../include/rust/ed25519.h | 0 .../include/rust/ed25519/types.h | 0 .../include/rust/helpers.h | 0 .../include/rust/history.h | 0 .../include/rust/map.h | 0 .../include/rust/metrics.h | 0 .../include/rust/orchard.h | 0 .../rust/orchard/incremental_merkle_tree.h | 0 .../include/rust/orchard/keys.h | 0 .../include/rust/orchard/wallet.h | 0 .../include/rust/streams.h | 0 .../include/rust/test_harness.h | 0 .../include/rust/transaction.h | 0 .../include/rust/types.h | 0 .../include/rust/unified_keys.h | 0 .../include/rust/zip339.h | 0 .../include/tracing.h | 0 .../src/address_ffi.rs | 0 .../src/blake2b.rs | 0 .../src/builder_ffi.rs | 0 .../src/ed25519.rs | 0 .../src/history_ffi.rs | 0 .../src/incremental_merkle_tree.rs | 0 .../src/incremental_merkle_tree_ffi.rs | 0 .../src/metrics_ffi.rs | 0 .../src/orchard_ffi.rs | 0 .../src/orchard_keys_ffi.rs | 0 .../src/rustzcash.rs | 0 .../src/streams_ffi.rs | 0 .../src/test_harness_ffi.rs | 0 .../src/tests/key_agreement.rs | 0 .../src/tests/key_components.rs | 0 .../src/tests/mmr.rs | 0 .../src/tests/mod.rs | 0 .../src/tests/notes.rs | 0 .../src/tests/res/tree1023.dat | Bin .../src/tests/res/tree16.dat | Bin .../src/tests/signatures.rs | 0 .../src/tests/zip339.rs | 0 .../src/tracing_ffi.rs | 0 .../src/transaction_ffi.rs | 0 .../src/unified_keys_ffi.rs | 0 .../src/wallet.rs | 0 .../src/zcashd_orchard.rs | 0 .../src/zip339_ffi.rs | 0 tezt/long_tests/dune | 2 +- tezt/manual_tests/dune | 2 +- tezt/self_tests/dune | 1 - tezt/vesting_contract_test/dune | 2 +- 313 files changed, 3050 insertions(+), 350 deletions(-) create mode 100644 opam/octez-rustzcash-deps.opam create mode 100644 src/rustzcash_deps/.cargo/config.toml create mode 100644 src/rustzcash_deps/Cargo.lock rename src/{rust_deps/librustzcash => rustzcash_deps}/Cargo.toml (97%) rename src/{rust_deps/librustzcash => rustzcash_deps}/README.md (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/bin/wallet_tool.rs (100%) create mode 100755 src/rustzcash_deps/build.sh create mode 100644 src/rustzcash_deps/dune rename src/{rust_deps/librustzcash => rustzcash_deps}/include/librustzcash.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/VA_OPT.hpp (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/address.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/blake2b.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/builder.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/ed25519.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/ed25519/types.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/helpers.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/history.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/map.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/metrics.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/orchard.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/orchard/incremental_merkle_tree.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/orchard/keys.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/orchard/wallet.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/streams.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/test_harness.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/transaction.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/types.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/unified_keys.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/rust/zip339.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/include/tracing.h (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/address_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/blake2b.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/builder_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/ed25519.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/history_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/incremental_merkle_tree.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/incremental_merkle_tree_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/metrics_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/orchard_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/orchard_keys_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/rustzcash.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/streams_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/test_harness_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/key_agreement.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/key_components.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/mmr.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/mod.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/notes.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/res/tree1023.dat (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/res/tree16.dat (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/signatures.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tests/zip339.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/tracing_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/transaction_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/unified_keys_ffi.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/wallet.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/zcashd_orchard.rs (100%) rename src/{rust_deps/librustzcash => rustzcash_deps}/src/zip339_ffi.rs (100%) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 353e24915c8b..36cc28198c14 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -2037,6 +2037,7 @@ opam:all_7: - tezos-openapi - tezos-dal-node-services - octez-smart-rollup-wasm-debugger-plugin + - octez-rustzcash-deps - octez-rust-deps - octez-riscv-api - octez-libs diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 4baa43692399..c1942b8ae34a 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -2037,6 +2037,7 @@ opam:all_7: - tezos-openapi - tezos-dal-node-services - octez-smart-rollup-wasm-debugger-plugin + - octez-rustzcash-deps - octez-rust-deps - octez-riscv-api - octez-libs diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index d4ecf96a7bde..b662b89848b6 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -1443,6 +1443,7 @@ opam:all_7: - tezos-openapi - tezos-dal-node-services - octez-smart-rollup-wasm-debugger-plugin + - octez-rustzcash-deps - octez-rust-deps - octez-riscv-api - octez-libs diff --git a/brassaia/test/brassaia-mem/dune b/brassaia/test/brassaia-mem/dune index 6ac59e79748f..d23f9d2b7e3d 100644 --- a/brassaia/test/brassaia-mem/dune +++ b/brassaia/test/brassaia-mem/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.tezos-context-brassaia.memory octez-libs.brassaia_test_helpers diff --git a/brassaia/test/brassaia-pack/dune b/brassaia/test/brassaia-pack/dune index 6b152ed4101a..050b99d71487 100644 --- a/brassaia/test/brassaia-pack/dune +++ b/brassaia/test/brassaia-pack/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.tezos-context.memory octez-libs.brassaia diff --git a/brassaia/test/brassaia-tezos/dune b/brassaia/test/brassaia-tezos/dune index b0c8a66ae3eb..7b7ccb8066f7 100644 --- a/brassaia/test/brassaia-tezos/dune +++ b/brassaia/test/brassaia-tezos/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.brassaia_test_helpers octez-libs.brassaia_tezos diff --git a/brassaia/test/brassaia/data/dune b/brassaia/test/brassaia/data/dune index e0d63f1c5ae8..4e4cf2776390 100644 --- a/brassaia/test/brassaia/data/dune +++ b/brassaia/test/brassaia/data/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/brassaia/test/brassaia/dune b/brassaia/test/brassaia/dune index 1906621991e0..1e17bcf8293c 100644 --- a/brassaia/test/brassaia/dune +++ b/brassaia/test/brassaia/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/brassaia/test/brassaia/generic-key/dune b/brassaia/test/brassaia/generic-key/dune index f39366ad81a7..6a340cc3a1ad 100644 --- a/brassaia/test/brassaia/generic-key/dune +++ b/brassaia/test/brassaia/generic-key/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/brassaia/test/dune b/brassaia/test/dune index e32b1bdcadd5..b326cd0db01f 100644 --- a/brassaia/test/dune +++ b/brassaia/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/contrib/octez_injector_server/dune b/contrib/octez_injector_server/dune index 57e08e985fea..3d6b53bd2270 100644 --- a/contrib/octez_injector_server/dune +++ b/contrib/octez_injector_server/dune @@ -7,7 +7,7 @@ (package octez-injector-server) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-injector diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 7f23e5f6425e..844b43c61dd9 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -23,7 +23,7 @@ (executable (name get_contracts) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.micheline octez-libs.base diff --git a/devtools/proto_context_du/dune b/devtools/proto_context_du/dune index 6e33d8c7d74c..9f20a3bf5e0d 100644 --- a/devtools/proto_context_du/dune +++ b/devtools/proto_context_du/dune @@ -6,7 +6,7 @@ (public_name proto_context_du) (package internal-devtools_proto-context-du) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.clic octez-libs.base diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune index f34022d4fb0f..6ea052d55700 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -4,7 +4,7 @@ (executable (name testnet_experiment_tools) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive tezt tezt-tezos @@ -68,7 +68,7 @@ (executable (name simulation_scenario) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.stdlib-unix octez-libs.base @@ -102,7 +102,7 @@ (executable (name extract_data) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix @@ -124,7 +124,7 @@ (executable (name safety_checker) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-shell-libs.store @@ -149,7 +149,7 @@ (executable (name get_teztale_data) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 280528cede8f..3ef19a3b67e2 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -22,7 +22,7 @@ (executable (name yes_wallet) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive yes_wallet_lib) (link_flags diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index f7e39ccf47c7..6b2e26e76201 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -4,7 +4,7 @@ (executables (names rpc_doc p2p_doc) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.rpc diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index 697da9724109..214021838fd4 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -4,7 +4,7 @@ (executable (name error_doc) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.error-monad diff --git a/dune-project b/dune-project index 202fbb7aaf28..8dcb5775e694 100644 --- a/dune-project +++ b/dune-project @@ -69,6 +69,7 @@ (package (name octez-riscv-pvm-test)(allow_empty)) (package (name octez-rpc-process)) (package (name octez-rust-deps)) +(package (name octez-rustzcash-deps)) (package (name octez-shell-libs)) (package (name octez-shell-tests)(allow_empty)) (package (name octez-signer)) diff --git a/irmin/test/dune b/irmin/test/dune index 4a41111b2453..efa3d17386e3 100644 --- a/irmin/test/dune +++ b/irmin/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/irmin/test/irmin-mem/dune b/irmin/test/irmin-mem/dune index 2535d46ab5a6..c2714f556adc 100644 --- a/irmin/test/irmin-mem/dune +++ b/irmin/test/irmin-mem/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.tezos-context.memory octez-internal-libs.irmin_test_helpers diff --git a/irmin/test/irmin-pack/dune b/irmin/test/irmin-pack/dune index 443287ac4fd2..a8dde31cb9ba 100644 --- a/irmin/test/irmin-pack/dune +++ b/irmin/test/irmin-pack/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.tezos-context.memory octez-internal-libs.irmin diff --git a/irmin/test/irmin-tezos/dune b/irmin/test/irmin-tezos/dune index 91dbd5c7a319..e7118ecc40f3 100644 --- a/irmin/test/irmin-tezos/dune +++ b/irmin/test/irmin-tezos/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-internal-libs.irmin_test_helpers octez-internal-libs.irmin_tezos diff --git a/irmin/test/irmin/data/dune b/irmin/test/irmin/data/dune index 9a51646007e9..8a5e4ea0248d 100644 --- a/irmin/test/irmin/data/dune +++ b/irmin/test/irmin/data/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/irmin/test/irmin/dune b/irmin/test/irmin/dune index e94afdba8755..da742a55add1 100644 --- a/irmin/test/irmin/dune +++ b/irmin/test/irmin/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/irmin/test/irmin/generic-key/dune b/irmin/test/irmin/generic-key/dune index f5460c92860b..f993c55d6111 100644 --- a/irmin/test/irmin/generic-key/dune +++ b/irmin/test/irmin/generic-key/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 2f6bac59b28b..a284d9d79bb2 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -492,6 +492,46 @@ let octez_rpc = uri; ] +let octez_rustzcash_deps = + public_lib + "octez-rustzcash-deps" + ~path:"src/rustzcash_deps" + ~synopsis:"Octez Rustzcash Dependencies" + ~foreign_archives:["octez_rustzcash_deps"] + ~dune: + Dune. + [ + [ + S "dirs"; + S ":standard"; + (* We need this stanza to ensure .cargo can be used as a + dependency via source_tree. *) + S ".cargo"; + (* Do not track Cargo output directory. *) + [S "not"; S "target"]; + ]; + [ + S "rule"; + [ + S "targets"; + S "liboctez_rustzcash_deps.a"; + S "dlloctez_rustzcash_deps.so"; + ]; + [ + S "deps"; + [S "file"; S "build.sh"]; + [S "file"; S "Cargo.toml"]; + [S "file"; S "Cargo.lock"]; + [S "file"; S "../../rust-toolchain"]; + [S "source_tree"; S ".cargo"]; + [S "source_tree"; S "bin"]; + [S "source_tree"; S "include"]; + [S "source_tree"; S "src"]; + ]; + [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; + ]; + ] + let octez_rust_deps = public_lib "octez-rust-deps" @@ -526,7 +566,7 @@ let octez_rust_deps = [S "file"; S "Cargo.lock"]; [S "file"; S "../../rust-toolchain"]; [S "source_tree"; S ".cargo"]; - [S "source_tree"; S "librustzcash"]; + [S "source_tree"; S "../rustzcash_deps"]; [S "source_tree"; S "wasmer-3.3.0"]; [S "source_tree"; S "src"]; [S "source_tree"; S "../riscv"]; @@ -669,7 +709,7 @@ let bls12_381 = ]; ] -let tezt ?(deps = []) = tezt ~deps:(octez_rust_deps :: bls12_381_archive :: deps) +let tezt ?(deps = []) = tezt ~deps:(bls12_381_archive :: deps) let _bls12_381_tests = tezt @@ -2526,7 +2566,7 @@ let _octez_wasmer_test = ["test_wasmer"] ~path:"src/lib_wasmer/test" ~opam:"octez-l2-libs" - ~deps:[octez_wasmer; alcotezt] + ~deps:[octez_rust_deps; octez_wasmer; alcotezt] let octez_context_encoding = octez_lib @@ -3074,12 +3114,12 @@ let octez_sapling = tezos_sapling_parameters; octez_lwt_result_stdlib; ] - ~dep_globs_rec:["../rust_deps/librustzcash/*"] + ~dep_globs_rec:["../rustzcash_deps/*"] ~foreign_stubs: { language = C; flags = [S ":standard"]; - include_dirs = ["../rust_deps/librustzcash/include"]; + include_dirs = ["../rustzcash_deps/include"]; names = ["rustzcash_ctypes_c_stubs"]; } ~c_library_flags:["-lpthread"] @@ -3116,6 +3156,7 @@ let _octez_sapling_tests = ~dep_files:["vectors.csv"; "vectors-zip32.csv"] ~deps: [ + octez_rustzcash_deps; octez_sapling |> open_; octez_crypto; str; @@ -3701,8 +3742,9 @@ let octez_shell = Dune. [[S "package"; S "octez-shell-libs"]; [S "mld_files"; S "octez_shell"]] ~inline_tests:ppx_expect - ~inline_tests_libraries:[octez_rust_deps; bls12_381_archive] - ~inline_tests_link_flags:["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] + ~inline_tests_libraries:[octez_rustzcash_deps; bls12_381_archive] + ~inline_tests_link_flags: + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] ~preprocess ~preprocessor_deps ~deps: @@ -3846,7 +3888,8 @@ let _octez_client_base_tests = ~path:"src/lib_client_base/test" ~opam:"octez-shell-libs" ~with_macos_security_framework:true - ~deps:[octez_base; octez_client_base |> open_; alcotezt] + ~deps: + [octez_rustzcash_deps; octez_base; octez_client_base |> open_; alcotezt] let _bip39_generator = private_exe @@ -3895,6 +3938,7 @@ let _octez_signer_backends_tests = ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base; octez_base_unix; octez_stdlib |> open_; @@ -3943,6 +3987,7 @@ let _octez_signer_backends_unix_tests = ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_error_monad |> open_; octez_stdlib |> open_; octez_crypto; @@ -4066,6 +4111,7 @@ let _octez_mockup_tests = ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; octez_base_test_helpers |> open_; octez_test_helpers |> open_; @@ -4160,6 +4206,7 @@ let _octez_proxy_tests = ~opam:"octez-shell-libs" ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_stdlib_unix; @@ -4211,6 +4258,7 @@ let _octez_client_base_unix_tests = ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; octez_mockup_commands; octez_client_base_unix; @@ -4440,6 +4488,7 @@ let _octez_riscv_pvm_test = ~synopsis:"Tests for RISC-V OCaml API" ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; octez_stdlib_unix |> open_; octez_base_test_helpers |> open_; @@ -4498,6 +4547,7 @@ let _octez_layer2_indexed_store_test = ~opam:"octez-l2-libs" ~deps: [ + octez_rust_deps; octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; octez_layer2_store |> open_; qcheck_alcotest; @@ -4927,6 +4977,7 @@ let _octez_scoru_wasm_tests = ~opam:"octez-l2-libs" ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; tree_encoding; octez_base_unix; @@ -4955,6 +5006,7 @@ let _octez_scoru_wasm_fast_tests = ~opam:"octez-l2-libs" ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; tree_encoding; octez_base_unix; @@ -5305,6 +5357,7 @@ end = struct ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ + octez_rustzcash_deps; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5323,6 +5376,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5378,6 +5432,7 @@ end = struct ]) ~deps: [ + octez_rustzcash_deps; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5420,6 +5475,7 @@ end = struct ~dep_globs:(conditional_list [("contracts/*", N.(number >= 013))]) ~deps: [ + octez_rustzcash_deps; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5451,6 +5507,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; alcotezt |> if_ N.(number <= 018); octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5492,6 +5549,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; (if N.(number >= 015) then Some tezt_lib else None) |> if_some; alcotezt |> if_ N.(number <= 018); octez_base |> open_ ~m:"TzPervasives" @@ -5541,6 +5599,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base |> if_ N.(number <= 14) |> open_ ~m:"TzPervasives" @@ -5612,6 +5671,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_base_test_helpers |> open_; @@ -5652,6 +5712,7 @@ end = struct ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; tezt_tezos |> open_; main |> open_; @@ -6129,7 +6190,7 @@ let hash = Protocol.hash ~opam:(sf "tezos-protocol-%s" name_dash) ~deps: [ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; parameters |> open_; @@ -6251,11 +6312,12 @@ let hash = Protocol.hash ~bisect_ppx:(if N.(number >= 008) then Yes else No) ?inline_tests:(if N.(number >= 009) then Some ppx_expect else None) ?inline_tests_libraries: - (if N.(number >= 009) then Some [bls12_381_archive; octez_rust_deps] + (if N.(number >= 009) then + Some [bls12_381_archive; octez_rustzcash_deps] else None) ?inline_tests_link_flags: (if N.(number >= 009) then - Some ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] + Some ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] else None) ~linkall:true in @@ -6305,6 +6367,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_base_test_helpers |> open_; @@ -6334,6 +6397,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_micheline |> open_; @@ -6510,7 +6574,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018) @@ -6557,6 +6621,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_protocol_environment |> if_ N.(number <= 011); @@ -6641,7 +6706,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -6671,9 +6736,9 @@ let hash = Protocol.hash client |> if_some |> open_; ] ~inline_tests:ppx_expect - ~inline_tests_libraries:[bls12_381_archive; octez_rust_deps] + ~inline_tests_libraries:[bls12_381_archive; octez_rustzcash_deps] ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] ~linkall:true in let dal = @@ -6697,9 +6762,9 @@ let hash = Protocol.hash main |> open_; ] ~inline_tests:ppx_expect - ~inline_tests_libraries:[bls12_381_archive; octez_rust_deps] + ~inline_tests_libraries:[bls12_381_archive; octez_rustzcash_deps] ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] ~linkall:true in let _dal_tests = @@ -6718,6 +6783,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); dal |> if_some |> open_; @@ -6752,9 +6818,9 @@ let hash = Protocol.hash main |> open_; ] ~inline_tests:ppx_expect - ~inline_tests_libraries:[bls12_381_archive; octez_rust_deps] + ~inline_tests_libraries:[bls12_381_archive; octez_rustzcash_deps] ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] ~linkall:true in let octez_injector = @@ -6868,6 +6934,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); main |> open_; @@ -6903,7 +6970,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_micheline |> open_; octez_micheline_rewriting; @@ -6960,7 +7027,7 @@ let hash = Protocol.hash ~opam:(sf "tezos-benchmark-%s" name_dash) ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> error_monad_module N.(number <= 018); octez_micheline |> open_; @@ -7149,6 +7216,7 @@ let _octez_micheline_rewriting_tests = ~opam:"tezos-micheline-rewriting" ~deps: [ + octez_rustzcash_deps; octez_micheline |> open_; octez_micheline_rewriting; Protocol.(main alpha); @@ -7180,6 +7248,7 @@ let octez_store_tests = ~synopsis:"Store tests" ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; octez_crypto |> open_; octez_context_ops |> open_; @@ -7266,6 +7335,7 @@ let _octez_shell_tests = ~synopsis:"Shell tests" ~deps: [ + octez_rustzcash_deps; octez_base |> open_ ~m:"TzPervasives"; octez_base_test_helpers |> open_; octez_store |> open_; @@ -7356,7 +7426,7 @@ let _get_contracts = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_micheline |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -7375,7 +7445,7 @@ let _proto_context_du = ~opam:"internal-devtools_proto-context-du" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_clic; octez_base |> open_ ~m:"TzPervasives"; @@ -7444,12 +7514,7 @@ let _yes_wallet = ~synopsis: "A script extracting delegates' keys from a context into a wallet." ~opam:"" - ~deps: - [ - octez_rust_deps (* for rustzcash *); - bls12_381_archive; - yes_wallet_lib |> open_; - ] + ~deps:[octez_rustzcash_deps; bls12_381_archive; yes_wallet_lib |> open_] ~modules:["yes_wallet"] ~bisect_ppx:No @@ -7485,7 +7550,7 @@ let _testnet_experiment_tools = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos; @@ -7585,7 +7650,7 @@ let _simulation_scenario = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_stdlib_unix |> open_; octez_base |> open_ |> open_ ~m:"TzPervasives"; @@ -7613,7 +7678,7 @@ let _extract_data = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -7636,7 +7701,7 @@ let _safety_checker = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_store |> open_; @@ -7660,7 +7725,7 @@ let _get_teztale_data = ~opam:"" ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_clic; @@ -7755,7 +7820,7 @@ let _octez_node = ~preprocessor_deps ~deps: ([ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> open_; octez_base_unix |> open_; @@ -7805,7 +7870,7 @@ let _octez_agnostic_baker = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; data_encoding |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -7859,7 +7924,7 @@ let _octez_client = ~release_status:Released ~deps: ([ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -7912,7 +7977,7 @@ let _octez_codec = ~with_macos_security_framework:true ~deps: ([ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; data_encoding |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -7948,7 +8013,7 @@ let _octez_snoop = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -7983,7 +8048,7 @@ let _octez_injector_server = ~linkall:true ~deps: ([ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_injector_lib |> open_; @@ -8055,7 +8120,7 @@ let _octez_signer = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8088,7 +8153,7 @@ let _octez_tps_evaluation = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; caqti; @@ -8282,7 +8347,7 @@ let _octez_dac_client = ~with_macos_security_framework:true ~deps: ([ - octez_rust_deps; + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8381,6 +8446,7 @@ let _octez_smart_rollup_node_lib_tests = ~with_macos_security_framework:true ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad"; octez_stdlib_unix |> open_; @@ -8452,6 +8518,7 @@ let _octez_scoru_wasm_regressions = ~synopsis:"WASM PVM regressions" ~deps: [ + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; octez_scoru_wasm |> open_; octez_scoru_wasm_helpers; @@ -8492,7 +8559,7 @@ let _tezt_long_tests = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_ |> open_ ~m:"Runnable.Syntax"; @@ -8518,7 +8585,7 @@ let _tezt_manual_tests = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_test_helpers |> open_; tezt_wrapper |> open_ |> open_ ~m:"Base"; @@ -8563,7 +8630,7 @@ let _tezt_vesting_contract_test = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_; @@ -8584,7 +8651,7 @@ let _docs_doc_gen = ~release_status:Unreleased ~deps: ([ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_rpc; @@ -8610,7 +8677,7 @@ let _docs_doc_gen_errors = ~linkall:true ~deps: [ - octez_rust_deps (* for rustzcash *); + octez_rustzcash_deps; bls12_381_archive; octez_base |> open_; octez_error_monad |> open_; diff --git a/opam/bls12-381.opam b/opam/bls12-381.opam index 3d2a3cbb0d62..a92a73fe7242 100644 --- a/opam/bls12-381.opam +++ b/opam/bls12-381.opam @@ -14,7 +14,6 @@ depends: [ "zarith" { >= "1.13" & < "1.14" } "hex" { >= "1.3.0" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" { with-test & = version } "octez-alcotezt" { with-test & = version } "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/internal-devtools_proto-context-du.opam b/opam/internal-devtools_proto-context-du.opam index 90ff193b3b60..836f223976fa 100644 --- a/opam/internal-devtools_proto-context-du.opam +++ b/opam/internal-devtools_proto-context-du.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-node-config" { = version } diff --git a/opam/octez-accuser-PsParisC.opam b/opam/octez-accuser-PsParisC.opam index cad97975f3a3..cff0feafa395 100644 --- a/opam/octez-accuser-PsParisC.opam +++ b/opam/octez-accuser-PsParisC.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-020-PsParisC" { = version } diff --git a/opam/octez-accuser-PsQuebec.opam b/opam/octez-accuser-PsQuebec.opam index 6b664fe1345d..a8ea09af4b53 100644 --- a/opam/octez-accuser-PsQuebec.opam +++ b/opam/octez-accuser-PsQuebec.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-021-PsQuebec" { = version } diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index cc33af4af427..cb720ccaa6b8 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-alpha" { = version } diff --git a/opam/octez-agnostic-baker.opam b/opam/octez-agnostic-baker.opam index 5e6d190498f2..dea2cc27543b 100644 --- a/opam/octez-agnostic-baker.opam +++ b/opam/octez-agnostic-baker.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-baker-PsParisC.opam b/opam/octez-baker-PsParisC.opam index 8c7b720c2443..1851fab1bf18 100644 --- a/opam/octez-baker-PsParisC.opam +++ b/opam/octez-baker-PsParisC.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-020-PsParisC" { = version } diff --git a/opam/octez-baker-PsQuebec.opam b/opam/octez-baker-PsQuebec.opam index 8b85e1a0b6b8..a5097402fb7a 100644 --- a/opam/octez-baker-PsQuebec.opam +++ b/opam/octez-baker-PsQuebec.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-021-PsQuebec" { = version } diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 057d4d4c222b..462b722018f3 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-alpha" { = version } diff --git a/opam/octez-client.opam b/opam/octez-client.opam index dc1a09f2311e..e5b3809f71cb 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 5d138761dca3..a93058a681d0 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index e75bcb377e83..8ed21cf4412b 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-injector-server.opam b/opam/octez-injector-server.opam index 1f0826372159..99da20de30ff 100644 --- a/opam/octez-injector-server.opam +++ b/opam/octez-injector-server.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-injector" { = version } diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 49730edbd580..ccb4a6ff9ca0 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -82,7 +82,7 @@ depends: [ "ctypes" { >= "0.18.0" } "tezos-sapling-parameters" { >= "1.1.0" } "lwt-watcher" { = "0.2" } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bigstring" {with-test} "bam-ppx" {with-test} "tezt-bam" {with-test} diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 6cf50e8631b7..ed1216c18efb 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-version" { = version } "octez-node-config" { = version } diff --git a/opam/octez-proto-libs.opam b/opam/octez-proto-libs.opam index ebc68f0f1567..cddeefa178f6 100644 --- a/opam/octez-proto-libs.opam +++ b/opam/octez-proto-libs.opam @@ -17,7 +17,6 @@ depends: [ "aches" { >= "1.1.0" } "aches-lwt" { >= "1.1.0" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" { with-test & = version } "octez-alcotezt" { with-test & = version } "qcheck-alcotest" { with-test & >= "0.20" } "lwt" { with-test & >= "5.7.0" } diff --git a/opam/octez-protocol-009-PsFLoren-libs.opam b/opam/octez-protocol-009-PsFLoren-libs.opam index 7994ec0470d7..5050cbf2691a 100644 --- a/opam/octez-protocol-009-PsFLoren-libs.opam +++ b/opam/octez-protocol-009-PsFLoren-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-010-PtGRANAD-libs.opam b/opam/octez-protocol-010-PtGRANAD-libs.opam index 244b2c61910e..680bf3cd2740 100644 --- a/opam/octez-protocol-010-PtGRANAD-libs.opam +++ b/opam/octez-protocol-010-PtGRANAD-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-011-PtHangz2-libs.opam b/opam/octez-protocol-011-PtHangz2-libs.opam index 98f5fe352ec9..b893db92d9a5 100644 --- a/opam/octez-protocol-011-PtHangz2-libs.opam +++ b/opam/octez-protocol-011-PtHangz2-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-012-Psithaca-libs.opam b/opam/octez-protocol-012-Psithaca-libs.opam index 39bafbb9984d..7e3878609d5f 100644 --- a/opam/octez-protocol-012-Psithaca-libs.opam +++ b/opam/octez-protocol-012-Psithaca-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-013-PtJakart-libs.opam b/opam/octez-protocol-013-PtJakart-libs.opam index 4cbc4d976c03..8fad4bd794aa 100644 --- a/opam/octez-protocol-013-PtJakart-libs.opam +++ b/opam/octez-protocol-013-PtJakart-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-014-PtKathma-libs.opam b/opam/octez-protocol-014-PtKathma-libs.opam index d3cf9f8c892c..225d65a6666a 100644 --- a/opam/octez-protocol-014-PtKathma-libs.opam +++ b/opam/octez-protocol-014-PtKathma-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-015-PtLimaPt-libs.opam b/opam/octez-protocol-015-PtLimaPt-libs.opam index 89f4a25bbe7a..a40c89619a44 100644 --- a/opam/octez-protocol-015-PtLimaPt-libs.opam +++ b/opam/octez-protocol-015-PtLimaPt-libs.opam @@ -16,7 +16,7 @@ depends: [ "ppx_expect" "uri" { >= "3.1.0" } "bls12-381" { with-test & = version } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } ] build: [ diff --git a/opam/octez-protocol-016-PtMumbai-libs.opam b/opam/octez-protocol-016-PtMumbai-libs.opam index 62416e20218f..af113e5fc337 100644 --- a/opam/octez-protocol-016-PtMumbai-libs.opam +++ b/opam/octez-protocol-016-PtMumbai-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } diff --git a/opam/octez-protocol-017-PtNairob-libs.opam b/opam/octez-protocol-017-PtNairob-libs.opam index d7e1fa65cc5b..be76b833ad6a 100644 --- a/opam/octez-protocol-017-PtNairob-libs.opam +++ b/opam/octez-protocol-017-PtNairob-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } diff --git a/opam/octez-protocol-018-Proxford-libs.opam b/opam/octez-protocol-018-Proxford-libs.opam index 125752cfc730..176cc825ecc0 100644 --- a/opam/octez-protocol-018-Proxford-libs.opam +++ b/opam/octez-protocol-018-Proxford-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } diff --git a/opam/octez-protocol-019-PtParisB-libs.opam b/opam/octez-protocol-019-PtParisB-libs.opam index 854e522182fd..9bd0cdd7591e 100644 --- a/opam/octez-protocol-019-PtParisB-libs.opam +++ b/opam/octez-protocol-019-PtParisB-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "octez-proto-libs" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } diff --git a/opam/octez-protocol-020-PsParisC-libs.opam b/opam/octez-protocol-020-PsParisC-libs.opam index 1f909cfbca82..a2aa4f77d1e9 100644 --- a/opam/octez-protocol-020-PsParisC-libs.opam +++ b/opam/octez-protocol-020-PsParisC-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "tezt" { >= "4.1.0" & < "5.0.0" } "tezt-tezos" { = version } "qcheck-alcotest" { >= "0.20" } diff --git a/opam/octez-protocol-021-PsQuebec-libs.opam b/opam/octez-protocol-021-PsQuebec-libs.opam index 6c07b9f8e32e..7a7e57acc233 100644 --- a/opam/octez-protocol-021-PsQuebec-libs.opam +++ b/opam/octez-protocol-021-PsQuebec-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "tezt" { >= "4.1.0" & < "5.0.0" } "tezt-tezos" { = version } "qcheck-alcotest" { >= "0.20" } diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam index 30501958ac83..1eca3385a4d4 100644 --- a/opam/octez-protocol-alpha-libs.opam +++ b/opam/octez-protocol-alpha-libs.opam @@ -17,6 +17,7 @@ depends: [ "octez-rust-deps" { with-test & = version } "octez-shell-libs" { = version } "uri" { >= "3.1.0" } + "octez-rustzcash-deps" { with-test & = version } "tezt" { >= "4.1.0" & < "5.0.0" } "tezt-tezos" { = version } "qcheck-alcotest" { >= "0.20" } diff --git a/opam/octez-riscv-pvm-test.opam b/opam/octez-riscv-pvm-test.opam index 21ec60f15585..4642bdced0e6 100644 --- a/opam/octez-riscv-pvm-test.opam +++ b/opam/octez-riscv-pvm-test.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-alcotezt" {with-test} "octez-riscv-pvm" {with-test} diff --git a/opam/octez-rustzcash-deps.opam b/opam/octez-rustzcash-deps.opam new file mode 100644 index 000000000000..e246cd874c68 --- /dev/null +++ b/opam/octez-rustzcash-deps.opam @@ -0,0 +1,19 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.11.1" } + "ocaml" { >= "4.14" } +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Octez Rustzcash Dependencies" diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam index 47fbacbe07d4..e9cc9e8dc9aa 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -30,7 +30,7 @@ depends: [ "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "ppx_expect" - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "uri" { >= "3.1.0" } "ocplib-endian" "fmt" { >= "0.8.7" } diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam index f4ba64a7c1a1..a5dec11902d7 100644 --- a/opam/octez-shell-tests.opam +++ b/opam/octez-shell-tests.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rustzcash-deps" {with-test} "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index f40d41e5f5ef..1a7c53ab7168 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index a08a943f6325..a91b54bef7c5 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-benchmark" { = version } diff --git a/opam/octez-store-tests.opam b/opam/octez-store-tests.opam index d3a7e34cf39b..e211c6cdb5ff 100644 --- a/opam/octez-store-tests.opam +++ b/opam/octez-store-tests.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rustzcash-deps" {with-test} "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/tezos-benchmark-020-PsParisC.opam b/opam/tezos-benchmark-020-PsParisC.opam index 310170234f57..3d3af447b6d3 100644 --- a/opam/tezos-benchmark-020-PsParisC.opam +++ b/opam/tezos-benchmark-020-PsParisC.opam @@ -18,7 +18,7 @@ depends: [ "hashcons" "octez-protocol-020-PsParisC-libs" { = version } "prbnmcn-stats" { = "0.0.6" } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } ] build: [ diff --git a/opam/tezos-benchmark-021-PsQuebec.opam b/opam/tezos-benchmark-021-PsQuebec.opam index 39449357414e..cdd4af037a95 100644 --- a/opam/tezos-benchmark-021-PsQuebec.opam +++ b/opam/tezos-benchmark-021-PsQuebec.opam @@ -18,7 +18,7 @@ depends: [ "hashcons" "octez-protocol-021-PsQuebec-libs" { = version } "prbnmcn-stats" { = "0.0.6" } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } ] build: [ diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index cde16728325c..ae8b65b0ad81 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -18,7 +18,7 @@ depends: [ "hashcons" "octez-protocol-alpha-libs" { = version } "prbnmcn-stats" { = "0.0.6" } - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } ] build: [ diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index ae86f883b335..8c1a058c9988 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-alcotezt" {with-test} "octez-libs" {with-test} diff --git a/opam/tezos-benchmark-type-inference-020-PsParisC.opam b/opam/tezos-benchmark-type-inference-020-PsParisC.opam index 4cb073176631..f8fa8a70dd49 100644 --- a/opam/tezos-benchmark-type-inference-020-PsParisC.opam +++ b/opam/tezos-benchmark-type-inference-020-PsParisC.opam @@ -14,7 +14,7 @@ depends: [ "tezos-micheline-rewriting" { = version } "tezos-protocol-020-PsParisC" { = version } "hashcons" - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } "octez-protocol-020-PsParisC-libs" { with-test & = version } ] diff --git a/opam/tezos-benchmark-type-inference-021-PsQuebec.opam b/opam/tezos-benchmark-type-inference-021-PsQuebec.opam index ba3d4830c17c..43b9e8f3e37c 100644 --- a/opam/tezos-benchmark-type-inference-021-PsQuebec.opam +++ b/opam/tezos-benchmark-type-inference-021-PsQuebec.opam @@ -14,7 +14,7 @@ depends: [ "tezos-micheline-rewriting" { = version } "tezos-protocol-021-PsQuebec" { = version } "hashcons" - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } "octez-protocol-021-PsQuebec-libs" { with-test & = version } ] diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index 08765902e841..bfd794160c79 100644 --- a/opam/tezos-benchmark-type-inference-alpha.opam +++ b/opam/tezos-benchmark-type-inference-alpha.opam @@ -14,7 +14,7 @@ depends: [ "tezos-micheline-rewriting" { = version } "tezos-protocol-alpha" { = version } "hashcons" - "octez-rust-deps" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "bls12-381" { with-test & = version } "octez-protocol-alpha-libs" { with-test & = version } ] diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index 6f68cc50c5d1..d414fbd29346 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-libs" {with-test} "qcheck-core" {with-test} diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index f5e892ecd723..3e1e999d8eec 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -13,8 +13,8 @@ depends: [ "zarith" { >= "1.13" & < "1.14" } "octez-libs" { = version } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" { with-test & = version } "bls12-381" { with-test & = version } + "octez-rustzcash-deps" { with-test & = version } "tezos-protocol-alpha" { with-test & = version } "octez-protocol-alpha-libs" { with-test & = version } ] diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index c9e3fa205c38..e7e2de81939d 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 6aab2d68dc3b..b8ff04e97f06 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 13e89a626a6f..8819fd3388c5 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index b2660f241f1c..4db4293829e7 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index 8c70b04ce164..954b41aa191d 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index e6b38625721f..b6161089ac01 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index e3ab2bb1793f..865db519a8be 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-018-Proxford.opam b/opam/tezos-protocol-018-Proxford.opam index f51f01a42b1d..dd7bae168441 100644 --- a/opam/tezos-protocol-018-Proxford.opam +++ b/opam/tezos-protocol-018-Proxford.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-019-PtParisB.opam b/opam/tezos-protocol-019-PtParisB.opam index bfcae9c06fad..d97b1a72c18f 100644 --- a/opam/tezos-protocol-019-PtParisB.opam +++ b/opam/tezos-protocol-019-PtParisB.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-020-PsParisC-tests.opam b/opam/tezos-protocol-020-PsParisC-tests.opam index 2afe9c532efe..daac969f5b20 100644 --- a/opam/tezos-protocol-020-PsParisC-tests.opam +++ b/opam/tezos-protocol-020-PsParisC-tests.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rustzcash-deps" {with-test} "octez-libs" {with-test} "octez-protocol-020-PsParisC-libs" {with-test} "tezos-protocol-020-PsParisC" {with-test} @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-020-PsParisC" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezt-tezos" {with-test} + "octez-rust-deps" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-protocol-020-PsParisC.opam b/opam/tezos-protocol-020-PsParisC.opam index d1a3e8bed8e2..af96e55f7d7a 100644 --- a/opam/tezos-protocol-020-PsParisC.opam +++ b/opam/tezos-protocol-020-PsParisC.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-021-PsQuebec-tests.opam b/opam/tezos-protocol-021-PsQuebec-tests.opam index ad096d9ae255..6a46372e57b7 100644 --- a/opam/tezos-protocol-021-PsQuebec-tests.opam +++ b/opam/tezos-protocol-021-PsQuebec-tests.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rustzcash-deps" {with-test} "octez-libs" {with-test} "octez-protocol-021-PsQuebec-libs" {with-test} "tezos-protocol-021-PsQuebec" {with-test} @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-021-PsQuebec" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezt-tezos" {with-test} + "octez-rust-deps" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-protocol-021-PsQuebec.opam b/opam/tezos-protocol-021-PsQuebec.opam index e852a9668aee..96eb3c58222b 100644 --- a/opam/tezos-protocol-021-PsQuebec.opam +++ b/opam/tezos-protocol-021-PsQuebec.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 4611f662d5bc..a10d9db3aa62 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rustzcash-deps" {with-test} "octez-libs" {with-test} "octez-protocol-alpha-libs" {with-test} "tezos-protocol-alpha" {with-test} @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezt-tezos" {with-test} + "octez-rust-deps" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index d9763e9c3738..ac7fdb8525e8 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 7dd22db09a56..a5aacb3aba6c 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "tezos-protocol-020-PsParisC" {with-test} "octez-protocol-020-PsParisC-libs" {with-test} diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index 09ead9cc21c4..a2a753d3a050 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -13,8 +13,8 @@ depends: [ "ppx_import" {with-test} "ppx_deriving" {with-test} "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-l2-libs" {with-test} "tezos-protocol-alpha" {with-test} diff --git a/opam/tezos-smart-rollup-node-lib-test.opam b/opam/tezos-smart-rollup-node-lib-test.opam index 8530ab169b80..9c8ebdce10f6 100644 --- a/opam/tezos-smart-rollup-node-lib-test.opam +++ b/opam/tezos-smart-rollup-node-lib-test.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-l2-libs" {with-test} "octez-smart-rollup-node-lib" {with-test} diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 40841a1c1cc8..2e76aec9a163 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" { = version } + "octez-rustzcash-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "caqti" diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 79ee2cb68ee2..55d316023c5b 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos_internal_brassaia_tests.opam b/opam/tezos_internal_brassaia_tests.opam index ed989b8e9a01..1920404dbcaf 100644 --- a/opam/tezos_internal_brassaia_tests.opam +++ b/opam/tezos_internal_brassaia_tests.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-libs" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos_internal_irmin_tests.opam b/opam/tezos_internal_irmin_tests.opam index 01b46ab82c4d..c3ec6ec203e7 100644 --- a/opam/tezos_internal_irmin_tests.opam +++ b/opam/tezos_internal_irmin_tests.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-libs" {with-test} "octez-internal-libs" {with-test} diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index c121f19c627c..7dfb58290b2f 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -14,7 +14,6 @@ depends: [ "uri" { >= "3.1.0" } "tezt" { >= "4.1.0" & < "5.0.0" } "hex" { >= "1.3.0" } - "octez-rust-deps" { with-test & = version } "bls12-381" { with-test & = version } ] build: [ diff --git a/script-inputs/ci-opam-package-tests b/script-inputs/ci-opam-package-tests index e050e4fea58a..984030838c92 100644 --- a/script-inputs/ci-opam-package-tests +++ b/script-inputs/ci-opam-package-tests @@ -48,6 +48,7 @@ octez-riscv-api all 7 octez-riscv-pvm all 6 octez-rpc-process all 4 octez-rust-deps all 7 +octez-rustzcash-deps all 7 octez-shell-libs all 6 octez-signer exec 4 octez-smart-rollup-node exec 1 diff --git a/src/bin_agnostic_baker/dune b/src/bin_agnostic_baker/dune index 9dc76b0ea6ce..0b2ab5f507c5 100644 --- a/src/bin_agnostic_baker/dune +++ b/src/bin_agnostic_baker/dune @@ -7,7 +7,7 @@ (package octez-agnostic-baker) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.data-encoding octez-libs.base diff --git a/src/bin_client/dune b/src/bin_client/dune index 3faf6fda35b9..cd388f6703fd 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -7,7 +7,7 @@ (package octez-client) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_codec/dune b/src/bin_codec/dune index c555081261d0..a7b076c65fa9 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -7,7 +7,7 @@ (package octez-codec) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.data-encoding octez-libs.base diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 7708961b9261..66934221b0a1 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -7,7 +7,7 @@ (package octez-dac-client) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_node/dune b/src/bin_node/dune index 842e264069a4..f805af767977 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -7,7 +7,7 @@ (package octez-node) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 6b6833a3b805..b9d49e93b1da 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -7,7 +7,7 @@ (package octez-signer) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 0ed4a0b3903a..60c81d99c0f5 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -7,7 +7,7 @@ (package octez-snoop) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index 25f7d7c68bf4..e6104ea46330 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -7,7 +7,7 @@ (package tezos-tps-evaluation) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base caqti diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index c29ee2fd6efe..4f64020746fe 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.error-monad diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index 3128e38abe9e..d3d8001421fa 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index 7a026eaea43e..86bedd735347 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.micheline tezos-micheline-rewriting tezos-protocol-alpha.protocol diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index 143b1377f4bb..2dd46897dd7e 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-alcotezt octez-libs.base diff --git a/src/lib_bls12_381/test/dune b/src/lib_bls12_381/test/dune index e8fe10fe4026..e3f5c96423e7 100644 --- a/src/lib_bls12_381/test/dune +++ b/src/lib_bls12_381/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-alcotezt qcheck-alcotest diff --git a/src/lib_bls12_381_hash/test/dune b/src/lib_bls12_381_hash/test/dune index 94b44229c97e..6cce082b9b6f 100644 --- a/src/lib_bls12_381_hash/test/dune +++ b/src/lib_bls12_381_hash/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-alcotezt bls12-381 diff --git a/src/lib_bls12_381_polynomial/test/dune b/src/lib_bls12_381_polynomial/test/dune index d6b3b19f471c..fba3a7bdba9d 100644 --- a/src/lib_bls12_381_polynomial/test/dune +++ b/src/lib_bls12_381_polynomial/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-alcotezt qcheck-alcotest diff --git a/src/lib_bls12_381_signature/test/dune b/src/lib_bls12_381_signature/test/dune index 1efdc6603751..65b546919a95 100644 --- a/src/lib_bls12_381_signature/test/dune +++ b/src/lib_bls12_381_signature/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive bls12-381 octez-libs.bls12-381-signature diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index 4390b7f387a0..ab5f8cdc1a78 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.stdlib octez-libs.clic diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index dc50fe188d30..cd171588f8d0 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-shell-libs.client-base octez-alcotezt) diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 451f649e106c..09eb563a9c12 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-shell-libs.mockup-commands octez-shell-libs.client-base-unix diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune index c1a7530925f7..426a94158844 100644 --- a/src/lib_context/memory/test/dune +++ b/src/lib_context/memory/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index 29ea2b9123b7..4d3327219984 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune index 8e07ce5213e2..6e92a82336c8 100644 --- a/src/lib_crypto/test-unix/dune +++ b/src/lib_crypto/test-unix/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.stdlib octez-libs.crypto diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index 6c0d5c8e9c68..766ed8a6d113 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.stdlib octez-libs.crypto diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune index aed95b555dc1..6b7392fd7703 100644 --- a/src/lib_crypto_dal/test/dune +++ b/src/lib_crypto_dal/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.stdlib octez-libs.crypto-dal diff --git a/src/lib_gossipsub/test/dune b/src/lib_gossipsub/test/dune index cdb1dab5bb30..65be5570c3ce 100644 --- a/src/lib_gossipsub/test/dune +++ b/src/lib_gossipsub/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive fmt octez-libs.base diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index c555768208bd..c6a8e7678399 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.error-monad octez-l2-libs.layer2_store qcheck-alcotest diff --git a/src/lib_lazy_containers/test/dune b/src/lib_lazy_containers/test/dune index ad0124edc836..dc45f6b8928a 100644 --- a/src/lib_lazy_containers/test/dune +++ b/src/lib_lazy_containers/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.lazy-containers qcheck-core diff --git a/src/lib_mec/test/dune b/src/lib_mec/test/dune index fc7bba46126e..d05428ad5ff8 100644 --- a/src/lib_mec/test/dune +++ b/src/lib_mec/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-alcotezt octez-libs.mec) diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 568c019830b0..177315dc7f7e 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base-test-helpers octez-libs.test-helpers diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index da066d2f0b74..9e42ff274106 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune index 1ea8c7a09d08..882bc980ebfa 100644 --- a/src/lib_polynomial/test/dune +++ b/src/lib_polynomial/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive bls12-381 octez-libs.mec diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 05243f95f452..637d7313dfe6 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index e7f02c3309dd..da2f7d4c4fc8 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-shell-libs.shell-context octez-alcotezt diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 7042821d3eeb..45ec70917568 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base.unix octez-libs.stdlib-unix diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index 7289c39f4375..6d406f3c238b 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 48c2669300be..85e5595b89bf 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_riscv/pvm/test/dune b/src/lib_riscv/pvm/test/dune index 3e6ad42d69e4..8b9bc36a3cbe 100644 --- a/src/lib_riscv/pvm/test/dune +++ b/src/lib_riscv/pvm/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.stdlib-unix octez-libs.base-test-helpers diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index a8dc6b79b7b4..c4417236a147 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index 42409d7bc839..c1894ae99e2a 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -21,7 +21,7 @@ (foreign_stubs (language c) (flags (:standard)) - (include_dirs ../rust_deps/librustzcash/include) + (include_dirs ../rustzcash_deps/include) (names rustzcash_ctypes_c_stubs)) (c_library_flags (-lpthread))) diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index 3f9aea3b9a06..c22dd44aefc3 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.tezos-sapling octez-libs.crypto str diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index 76a4992126fd..7f659f58edb9 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.tree-encoding octez-libs.base.unix diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index 9dd436565f3a..df44982c25f0 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.scoru-wasm octez-l2-libs.scoru-wasm-helpers diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index 95db1985c031..fec7b535f12d 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.tree-encoding octez-libs.base.unix diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 632466a9325c..ed2decb2cbae 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -30,8 +30,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries octez-rust-deps bls12-381.archive)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries octez-rustzcash-deps bls12-381.archive)) (preprocess (pps ppx_expect octez-libs.ppx_profiler)) (preprocessor_deps (env_var TEZOS_PPX_PROFILER)) (flags diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index c22f00f21fb8..319e3739893c 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base-test-helpers octez-shell-libs.store diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index 236db751ed60..f4f454b37d7d 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-shell-libs.shell-services diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 64338e48fc0a..ef9596a9894c 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base.unix octez-libs.stdlib diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 70962e17eeab..74768a8238dc 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.error-monad octez-libs.stdlib octez-libs.crypto diff --git a/src/lib_smart_rollup_node/test/dune b/src/lib_smart_rollup_node/test/dune index a436a938d2c4..8cdaf4bcf4f1 100644 --- a/src/lib_smart_rollup_node/test/dune +++ b/src/lib_smart_rollup_node/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.stdlib-unix octez-libs.test-helpers diff --git a/src/lib_srs_extraction/test/dune b/src/lib_srs_extraction/test/dune index d0ff6986f7af..b766c3a93465 100644 --- a/src/lib_srs_extraction/test/dune +++ b/src/lib_srs_extraction/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.srs-extraction octez-alcotezt) diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index 5999ab0dbb84..6e7bd20d788f 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.error-monad octez-libs.stdlib-unix diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 4adbf5940ce1..1f47fe10d5a8 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.crypto octez-shell-libs.context-ops diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index 759989b2ac8e..a626d4e95a27 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.tree-encoding diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index 5d5b9383a478..f4261802b3db 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.version octez-libs.version.parser diff --git a/src/lib_wasmer/test/dune b/src/lib_wasmer/test/dune index da0514803e4b..1cb8fbed3ce4 100644 --- a/src/lib_wasmer/test/dune +++ b/src/lib_wasmer/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-l2-libs.wasmer octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_webassembly/tests/dune b/src/lib_webassembly/tests/dune index f9ebcf729991..6d997dc049f5 100644 --- a/src/lib_webassembly/tests/dune +++ b/src/lib_webassembly/tests/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.webassembly-interpreter octez-alcotezt) diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune index e793039aa7fe..d1e5fe74e6f0 100644 --- a/src/lib_workers/test/dune +++ b/src/lib_workers/test/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.stdlib octez-libs.stdlib-unix diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index dd352e7ac931..d1aa7f877cb3 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -19,8 +19,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 5e26781f15b9..6faf0ca9f0ee 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -19,8 +19,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index dd3d3c1afe0a..d31db32c97f7 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -22,8 +22,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index fb7e66e78b54..23c29b6a98f8 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-011-PtHangz2.parameters) diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 0d82cfa4b0c2..7ac5c79b9f1b 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -22,8 +22,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 33cdadc0fb5e..2289d034a4c6 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-012-Psithaca.parameters diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index d4282fc2c22a..ae73579050ef 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -22,8 +22,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 72152b73148f..38d115355f8e 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-013-PtJakart.parameters diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index f253f20f88c0..8d2b2168a6ce 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -22,8 +22,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index 434500481f05..eb067dd2877d 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-014-PtKathma.parameters diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index 9e92d23a2fa6..962521bdfdb4 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -22,8 +22,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 3d93c2c6b3a3..e94190b7c638 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-015-PtLimaPt.parameters diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index a11e9d6c1b7a..4d5f401a58bb 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_layer2_utils/dune b/src/proto_016_PtMumbai/lib_layer2_utils/dune index 57c24fb011f3..2337ef981fe9 100644 --- a/src/proto_016_PtMumbai/lib_layer2_utils/dune +++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index 2ff2915a0a5b..b43f931191a3 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-016-PtMumbai.parameters diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index bfa3005e6dae..10f40f5333bf 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_layer2_utils/dune b/src/proto_017_PtNairob/lib_layer2_utils/dune index cf061b26ffd5..ffa6eedd6bd2 100644 --- a/src/proto_017_PtNairob/lib_layer2_utils/dune +++ b/src/proto_017_PtNairob/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index b61eb6ec6c24..79653c75c3e4 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-017-PtNairob.parameters diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index 7c9e301da012..4c43da1ffcad 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_layer2_utils/dune b/src/proto_018_Proxford/lib_layer2_utils/dune index f08e94b1dd46..32658f8d5c3f 100644 --- a/src/proto_018_Proxford/lib_layer2_utils/dune +++ b/src/proto_018_Proxford/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index a24f8bad8ad3..c744259d91ca 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-018-Proxford.parameters diff --git a/src/proto_019_PtParisB/lib_client/dune b/src/proto_019_PtParisB/lib_client/dune index e20dd1d917f3..42cc4f14ed70 100644 --- a/src/proto_019_PtParisB/lib_client/dune +++ b/src/proto_019_PtParisB/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_019_PtParisB/lib_layer2_utils/dune b/src/proto_019_PtParisB/lib_layer2_utils/dune index 54c118bb40ec..a77866892e96 100644 --- a/src/proto_019_PtParisB/lib_layer2_utils/dune +++ b/src/proto_019_PtParisB/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_019_PtParisB/lib_parameters/dune b/src/proto_019_PtParisB/lib_parameters/dune index e506ce68ceb1..546667b6d904 100644 --- a/src/proto_019_PtParisB/lib_parameters/dune +++ b/src/proto_019_PtParisB/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-019-PtParisB.parameters diff --git a/src/proto_020_PsParisC/bin_accuser/dune b/src/proto_020_PsParisC/bin_accuser/dune index 81bdb5fd101d..ce1e3c779b29 100644 --- a/src/proto_020_PsParisC/bin_accuser/dune +++ b/src/proto_020_PsParisC/bin_accuser/dune @@ -7,7 +7,7 @@ (package octez-accuser-PsParisC) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_020_PsParisC/bin_baker/dune b/src/proto_020_PsParisC/bin_baker/dune index 5e5bf2ed31c5..2d38d33db798 100644 --- a/src/proto_020_PsParisC/bin_baker/dune +++ b/src/proto_020_PsParisC/bin_baker/dune @@ -7,7 +7,7 @@ (package octez-baker-PsParisC) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_020_PsParisC/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_020_PsParisC/lib_benchmark/lib_benchmark_type_inference/test/dune index 7b28364c7b44..0cff919b666a 100644 --- a/src/proto_020_PsParisC/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_020_PsParisC/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,7 +4,7 @@ (executables (names test_uf test_inference) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.micheline tezos-micheline-rewriting diff --git a/src/proto_020_PsParisC/lib_benchmark/test/dune b/src/proto_020_PsParisC/lib_benchmark/test/dune index 8c9045e0f73e..fe51c6787209 100644 --- a/src/proto_020_PsParisC/lib_benchmark/test/dune +++ b/src/proto_020_PsParisC/lib_benchmark/test/dune @@ -8,7 +8,7 @@ test_autocompletion test_distribution) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.micheline diff --git a/src/proto_020_PsParisC/lib_client/dune b/src/proto_020_PsParisC/lib_client/dune index ff9a1b435d67..a38af0a026ab 100644 --- a/src/proto_020_PsParisC/lib_client/dune +++ b/src/proto_020_PsParisC/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_020_PsParisC/lib_client/test/dune b/src/proto_020_PsParisC/lib_client/test/dune index 95b9eaec2fc9..9dac8c814792 100644 --- a/src/proto_020_PsParisC/lib_client/test/dune +++ b/src/proto_020_PsParisC/lib_client/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-020-PsParisC-libs.client diff --git a/src/proto_020_PsParisC/lib_dac_plugin/dune b/src/proto_020_PsParisC/lib_dac_plugin/dune index ccd99d0b5441..43ce526ac155 100644 --- a/src/proto_020_PsParisC/lib_dac_plugin/dune +++ b/src/proto_020_PsParisC/lib_dac_plugin/dune @@ -17,8 +17,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_020_PsParisC/lib_dal/dune b/src/proto_020_PsParisC/lib_dal/dune index 8f9abea64518..49958af8559f 100644 --- a/src/proto_020_PsParisC/lib_dal/dune +++ b/src/proto_020_PsParisC/lib_dal/dune @@ -18,8 +18,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_020_PsParisC/lib_dal/test/dune b/src/proto_020_PsParisC/lib_dal/test/dune index 17b2e0efe649..72e5d86301d7 100644 --- a/src/proto_020_PsParisC/lib_dal/test/dune +++ b/src/proto_020_PsParisC/lib_dal/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-protocol-020-PsParisC-libs.dal tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_delegate/test/dune b/src/proto_020_PsParisC/lib_delegate/test/dune index 1b32c6f7fb5a..991141563a84 100644 --- a/src/proto_020_PsParisC/lib_delegate/test/dune +++ b/src/proto_020_PsParisC/lib_delegate/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.test-helpers octez-libs.micheline diff --git a/src/proto_020_PsParisC/lib_delegate/test/tenderbrute/dune b/src/proto_020_PsParisC/lib_delegate/test/tenderbrute/dune index 36d062e71347..482bbd8cc6f2 100644 --- a/src/proto_020_PsParisC/lib_delegate/test/tenderbrute/dune +++ b/src/proto_020_PsParisC/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-shell-libs.client-base diff --git a/src/proto_020_PsParisC/lib_layer2_utils/dune b/src/proto_020_PsParisC/lib_layer2_utils/dune index 636eecc399a9..82236e853a0b 100644 --- a/src/proto_020_PsParisC/lib_layer2_utils/dune +++ b/src/proto_020_PsParisC/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_020_PsParisC/lib_parameters/dune b/src/proto_020_PsParisC/lib_parameters/dune index 1b973b29f5b1..6f286ddcfc21 100644 --- a/src/proto_020_PsParisC/lib_parameters/dune +++ b/src/proto_020_PsParisC/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-020-PsParisC.parameters diff --git a/src/proto_020_PsParisC/lib_plugin/test/dune b/src/proto_020_PsParisC/lib_plugin/test/dune index aa06ec337b99..eda250da530a 100644 --- a/src/proto_020_PsParisC/lib_plugin/test/dune +++ b/src/proto_020_PsParisC/lib_plugin/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base-test-helpers octez-libs.base.unix diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/consensus/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/consensus/dune index cdb06659957e..595b426d30d5 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/consensus/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/consensus/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/dune index 290b82edd7eb..17a4904733c1 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps tezt octez-libs.base octez-protocol-020-PsParisC-libs.client diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/gas/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/gas/dune index bce8bea9a141..44c8a08af23f 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/gas/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/gas/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/michelson/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/michelson/dune index 1f0be348191f..fbadb78785e7 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/michelson/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/michelson/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/operations/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/operations/dune index d4c0d066fccf..0d5ba76f0aee 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/operations/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/operations/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_protocol/test/integration/validate/dune b/src/proto_020_PsParisC/lib_protocol/test/integration/validate/dune index 4d9f75f498b7..0e63aea2eca5 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/integration/validate/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/integration/validate/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezos-protocol-020-PsParisC.protocol qcheck-alcotest diff --git a/src/proto_020_PsParisC/lib_protocol/test/pbt/dune b/src/proto_020_PsParisC/lib_protocol/test/pbt/dune index 67fc63b59536..c40fe06e083d 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/pbt/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/pbt/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-020-PsParisC-libs.client diff --git a/src/proto_020_PsParisC/lib_protocol/test/regression/dune b/src/proto_020_PsParisC/lib_protocol/test/regression/dune index 437b457ad56e..561e1e599d90 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/regression/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/regression/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezt-tezos tezos-protocol-020-PsParisC.protocol diff --git a/src/proto_020_PsParisC/lib_protocol/test/unit/dune b/src/proto_020_PsParisC/lib_protocol/test/unit/dune index b3c08d4cc1f3..7618b1ef4a99 100644 --- a/src/proto_020_PsParisC/lib_protocol/test/unit/dune +++ b/src/proto_020_PsParisC/lib_protocol/test/unit/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.base-test-helpers octez-libs.micheline diff --git a/src/proto_020_PsParisC/lib_sc_rollup_node/test/dune b/src/proto_020_PsParisC/lib_sc_rollup_node/test/dune index 9ca054a86bcb..fb91e6fd75ff 100644 --- a/src/proto_020_PsParisC/lib_sc_rollup_node/test/dune +++ b/src/proto_020_PsParisC/lib_sc_rollup_node/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base tezos-protocol-020-PsParisC.protocol octez-libs.test-helpers diff --git a/src/proto_021_PsQuebec/bin_accuser/dune b/src/proto_021_PsQuebec/bin_accuser/dune index d58ae95cef95..137d2f576760 100644 --- a/src/proto_021_PsQuebec/bin_accuser/dune +++ b/src/proto_021_PsQuebec/bin_accuser/dune @@ -7,7 +7,7 @@ (package octez-accuser-PsQuebec) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_021_PsQuebec/bin_baker/dune b/src/proto_021_PsQuebec/bin_baker/dune index ba8855e73a12..85e70a7bf7a6 100644 --- a/src/proto_021_PsQuebec/bin_baker/dune +++ b/src/proto_021_PsQuebec/bin_baker/dune @@ -7,7 +7,7 @@ (package octez-baker-PsQuebec) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_021_PsQuebec/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_021_PsQuebec/lib_benchmark/lib_benchmark_type_inference/test/dune index e4ec6cd80041..3ae5831ea2f0 100644 --- a/src/proto_021_PsQuebec/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_021_PsQuebec/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,7 +4,7 @@ (executables (names test_uf test_inference) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.micheline tezos-micheline-rewriting diff --git a/src/proto_021_PsQuebec/lib_benchmark/test/dune b/src/proto_021_PsQuebec/lib_benchmark/test/dune index 106eb7f62c33..49ad4db2bd69 100644 --- a/src/proto_021_PsQuebec/lib_benchmark/test/dune +++ b/src/proto_021_PsQuebec/lib_benchmark/test/dune @@ -8,7 +8,7 @@ test_autocompletion test_distribution) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.micheline diff --git a/src/proto_021_PsQuebec/lib_client/dune b/src/proto_021_PsQuebec/lib_client/dune index 957feb774d19..6f7c8d0f1c17 100644 --- a/src/proto_021_PsQuebec/lib_client/dune +++ b/src/proto_021_PsQuebec/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_021_PsQuebec/lib_client/test/dune b/src/proto_021_PsQuebec/lib_client/test/dune index da26de44e260..abdb42760fe2 100644 --- a/src/proto_021_PsQuebec/lib_client/test/dune +++ b/src/proto_021_PsQuebec/lib_client/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-021-PsQuebec-libs.client diff --git a/src/proto_021_PsQuebec/lib_dac_plugin/dune b/src/proto_021_PsQuebec/lib_dac_plugin/dune index 02290ed0aea7..4f4b120302d2 100644 --- a/src/proto_021_PsQuebec/lib_dac_plugin/dune +++ b/src/proto_021_PsQuebec/lib_dac_plugin/dune @@ -17,8 +17,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_021_PsQuebec/lib_dal/dune b/src/proto_021_PsQuebec/lib_dal/dune index 9c61424d7121..65fb946cd70f 100644 --- a/src/proto_021_PsQuebec/lib_dal/dune +++ b/src/proto_021_PsQuebec/lib_dal/dune @@ -18,8 +18,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_021_PsQuebec/lib_dal/test/dune b/src/proto_021_PsQuebec/lib_dal/test/dune index 0d17d1ccf820..9a0c1c84ca50 100644 --- a/src/proto_021_PsQuebec/lib_dal/test/dune +++ b/src/proto_021_PsQuebec/lib_dal/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-protocol-021-PsQuebec-libs.dal tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_delegate/test/dune b/src/proto_021_PsQuebec/lib_delegate/test/dune index bb6344a0eb3a..423cb73029b0 100644 --- a/src/proto_021_PsQuebec/lib_delegate/test/dune +++ b/src/proto_021_PsQuebec/lib_delegate/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.test-helpers octez-libs.micheline diff --git a/src/proto_021_PsQuebec/lib_delegate/test/tenderbrute/dune b/src/proto_021_PsQuebec/lib_delegate/test/tenderbrute/dune index 2a3333e2a78d..e5cd7c6ae973 100644 --- a/src/proto_021_PsQuebec/lib_delegate/test/tenderbrute/dune +++ b/src/proto_021_PsQuebec/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-shell-libs.client-base diff --git a/src/proto_021_PsQuebec/lib_layer2_utils/dune b/src/proto_021_PsQuebec/lib_layer2_utils/dune index 3c9914061420..3987b84f611b 100644 --- a/src/proto_021_PsQuebec/lib_layer2_utils/dune +++ b/src/proto_021_PsQuebec/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_021_PsQuebec/lib_parameters/dune b/src/proto_021_PsQuebec/lib_parameters/dune index 3844f67ca46d..a89ce37f7cf8 100644 --- a/src/proto_021_PsQuebec/lib_parameters/dune +++ b/src/proto_021_PsQuebec/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-021-PsQuebec.parameters diff --git a/src/proto_021_PsQuebec/lib_plugin/test/dune b/src/proto_021_PsQuebec/lib_plugin/test/dune index 92c9430e8df7..e916a5e8bcff 100644 --- a/src/proto_021_PsQuebec/lib_plugin/test/dune +++ b/src/proto_021_PsQuebec/lib_plugin/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base-test-helpers octez-libs.base.unix diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/consensus/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/consensus/dune index da34494542b8..4139938125d4 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/consensus/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/consensus/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/dune index 41d8db7f5b1d..2b2b36445841 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps tezt octez-libs.base octez-protocol-021-PsQuebec-libs.client diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/gas/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/gas/dune index ec6456ca094e..2c379331c4e4 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/gas/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/gas/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/michelson/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/michelson/dune index 8cf90f8d9049..4f38ca15a99f 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/michelson/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/michelson/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/operations/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/operations/dune index 1d0f4fe7a845..af4404b73447 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/operations/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/operations/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_protocol/test/integration/validate/dune b/src/proto_021_PsQuebec/lib_protocol/test/integration/validate/dune index 7e59b7ddabe8..86fe637e47ea 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/integration/validate/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/integration/validate/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezos-protocol-021-PsQuebec.protocol qcheck-alcotest diff --git a/src/proto_021_PsQuebec/lib_protocol/test/pbt/dune b/src/proto_021_PsQuebec/lib_protocol/test/pbt/dune index 2749c64574d2..95457df148fb 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/pbt/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/pbt/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-021-PsQuebec-libs.client diff --git a/src/proto_021_PsQuebec/lib_protocol/test/regression/dune b/src/proto_021_PsQuebec/lib_protocol/test/regression/dune index b923c748cbab..bc4894ab51c3 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/regression/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/regression/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezt-tezos tezos-protocol-021-PsQuebec.protocol diff --git a/src/proto_021_PsQuebec/lib_protocol/test/unit/dune b/src/proto_021_PsQuebec/lib_protocol/test/unit/dune index 6317b81ea73e..e2609c2c9c49 100644 --- a/src/proto_021_PsQuebec/lib_protocol/test/unit/dune +++ b/src/proto_021_PsQuebec/lib_protocol/test/unit/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.base-test-helpers octez-libs.micheline diff --git a/src/proto_021_PsQuebec/lib_sc_rollup_node/test/dune b/src/proto_021_PsQuebec/lib_sc_rollup_node/test/dune index 6812632b64d1..dcede25e4972 100644 --- a/src/proto_021_PsQuebec/lib_sc_rollup_node/test/dune +++ b/src/proto_021_PsQuebec/lib_sc_rollup_node/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base tezos-protocol-021-PsQuebec.protocol octez-libs.test-helpers diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 019fdd8b1124..03801c83b3c3 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -7,7 +7,7 @@ (package octez-accuser-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index f722dee77913..1aa4f97899a4 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -7,7 +7,7 @@ (package octez-baker-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune index 7857eab702d5..9f9d402a8565 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,7 +4,7 @@ (executables (names test_uf test_inference) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.micheline tezos-micheline-rewriting diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune index b1d676dfe941..b0f26938a558 100644 --- a/src/proto_alpha/lib_benchmark/test/dune +++ b/src/proto_alpha/lib_benchmark/test/dune @@ -8,7 +8,7 @@ test_autocompletion test_distribution) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-libs.micheline diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 91635af112a6..afd1b37eca20 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -23,8 +23,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index e8d299715d94..560a939bb6d7 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_dac_plugin/dune b/src/proto_alpha/lib_dac_plugin/dune index 2310fd2bc3f5..7b91ccd24639 100644 --- a/src/proto_alpha/lib_dac_plugin/dune +++ b/src/proto_alpha/lib_dac_plugin/dune @@ -17,8 +17,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune index 03fd83c2ae1e..6efe42b5f1d7 100644 --- a/src/proto_alpha/lib_dal/dune +++ b/src/proto_alpha/lib_dal/dune @@ -18,8 +18,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune index 7e13dda5c747..dd1908013bd1 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-protocol-alpha-libs.dal tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index ce276745b47e..3f959f775dae 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.test-helpers octez-libs.micheline diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index 82006e70d18f..9c47e0c6ef35 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base octez-shell-libs.client-base diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune index 1cdd97f6dcfd..62e9f10ddbf9 100644 --- a/src/proto_alpha/lib_layer2_utils/dune +++ b/src/proto_alpha/lib_layer2_utils/dune @@ -12,8 +12,9 @@ (inline_tests (flags -verbose) (modes native) - (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) - (libraries bls12-381.archive octez-rust-deps)) + (executable + (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) + (libraries bls12-381.archive octez-rustzcash-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index 93bca49d3911..c3a03c7f82db 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.base tezos-protocol-alpha.parameters diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index be91b449f922..c23748a2ec5b 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.base-test-helpers octez-libs.base.unix diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index 0e3b4647f832..10c3636ec861 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index 39e45209ceb9..98a66ebf5d4f 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps tezt octez-libs.base octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune index 59e654d7446c..8464b75fcc66 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index 1661566c8bf7..6d40b76f5708 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index 25393600d5a4..5858e41ba5c7 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-alcotezt octez-libs.base tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 214c24aaaa69..88717b351dd4 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezos-protocol-alpha.protocol qcheck-alcotest diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index cc41358744f3..63db6b9e6d85 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base octez-libs.micheline octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index dc6308e54a53..26138fbe152e 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rustzcash-deps octez-libs.base tezt-tezos tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 4c5e8b3f96b4..5242624afb71 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base octez-libs.base-test-helpers octez-libs.micheline diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune index b69fc76c0539..6ae434898300 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive + octez-rust-deps octez-libs.base tezos-protocol-alpha.protocol octez-libs.test-helpers diff --git a/src/rust_deps/Cargo.lock b/src/rust_deps/Cargo.lock index 95c19cfcfece..388c90c3c9f0 100644 --- a/src/rust_deps/Cargo.lock +++ b/src/rust_deps/Cargo.lock @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.28" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "shlex", ] @@ -508,9 +508,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -518,9 +518,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -1698,9 +1698,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3449,7 +3449,7 @@ dependencies = [ name = "tezos-smart-rollup-utils" version = "0.2.2" dependencies = [ - "clap 4.5.19", + "clap 4.5.20", "hex", "quanta 0.12.3", "serde", @@ -3850,9 +3850,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3861,9 +3861,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -3899,9 +3899,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3909,9 +3909,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -3922,17 +3922,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a" +checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" dependencies = [ "leb128", + "wasmparser 0.219.1", ] [[package]] @@ -3997,7 +3998,7 @@ dependencies = [ "thiserror", "wasmer-types", "wasmer-vm", - "wasmparser", + "wasmparser 0.95.0", "winapi", ] @@ -4103,11 +4104,21 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser" +version = "0.219.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +dependencies = [ + "bitflags 2.6.0", + "indexmap 2.6.0", +] + [[package]] name = "wast" -version = "218.0.0" +version = "219.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a53cd1f0fa505df97557e36a58bddb8296e2fcdcd089529545ebfdb18a1b9d7" +checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" dependencies = [ "bumpalo", "leb128", @@ -4118,18 +4129,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.218.0" +version = "1.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f87f8e14e776762e07927c27c2054d2cf678aab9aae2d431a79b3e31e4dd391" +checksum = "8bc3cf014fb336883a411cd662f987abf6a1d2a27f2f0008616a0070bbf6bd0d" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/src/rust_deps/Cargo.toml b/src/rust_deps/Cargo.toml index 77018a9ce2b9..dd3040c651a1 100644 --- a/src/rust_deps/Cargo.toml +++ b/src/rust_deps/Cargo.toml @@ -12,7 +12,7 @@ default-features = false features = ["singlepass", "cranelift", "wat", "middlewares"] [dependencies.librustzcash] -path = "librustzcash" +path = "../rustzcash_deps" [dependencies.octez-riscv] path = "../riscv/lib" diff --git a/src/rust_deps/dune b/src/rust_deps/dune index 94e7bb4f93be..4e6bc21230dc 100644 --- a/src/rust_deps/dune +++ b/src/rust_deps/dune @@ -17,7 +17,7 @@ (file Cargo.lock) (file ../../rust-toolchain) (source_tree .cargo) - (source_tree librustzcash) + (source_tree ../rustzcash_deps) (source_tree wasmer-3.3.0) (source_tree src) (source_tree ../riscv) diff --git a/src/rustzcash_deps/.cargo/config.toml b/src/rustzcash_deps/.cargo/config.toml new file mode 100644 index 000000000000..f52e93b2275c --- /dev/null +++ b/src/rustzcash_deps/.cargo/config.toml @@ -0,0 +1,5 @@ +[build] +rustflags = ["-Awarnings"] + +[target.'cfg(target_os = "macos")'] +rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] diff --git a/src/rustzcash_deps/Cargo.lock b/src/rustzcash_deps/Cargo.lock new file mode 100644 index 000000000000..9823154a0768 --- /dev/null +++ b/src/rustzcash_deps/Cargo.lock @@ -0,0 +1,2554 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aead" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "atomic-shim" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] + +[[package]] +name = "base64ct" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" + +[[package]] +name = "bech32" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" + +[[package]] +name = "bellman" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4dd656ef4fdf7debb6d87d4dd92642fcbcdb78cbf6600c13e25c87e4d1a3807" +dependencies = [ + "bitvec", + "blake2s_simd", + "byteorder", + "crossbeam-channel", + "ff", + "group", + "lazy_static", + "log", + "num_cpus", + "pairing", + "rand_core 0.6.4", + "rayon", + "subtle", +] + +[[package]] +name = "bip0039" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0830ae4cc96b0617cc912970c2b17e89456fecbf55e8eed53a956f37ab50c41" +dependencies = [ + "hmac", + "pbkdf2", + "rand", + "sha2", + "unicode-normalization", + "zeroize", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + +[[package]] +name = "blake2b_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +dependencies = [ + "arrayref", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", +] + +[[package]] +name = "blake2s_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +dependencies = [ + "arrayref", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-modes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" +dependencies = [ + "block-padding", + "cipher", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "bls12_381" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +dependencies = [ + "sha2", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "cc" +version = "1.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clearscreen" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e55dadbdd203f69c0a107bc78fca6e47d605345610ee77dcf24203fdf510b317" +dependencies = [ + "nix", + "terminfo", + "thiserror", + "which", + "winapi", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +] + +[[package]] +name = "directories" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "ed25519-zebra" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +dependencies = [ + "curve25519-dalek", + "hashbrown 0.12.3", + "hex", + "rand_core 0.6.4", + "serde", + "sha2", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "equihash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4127688f6177e3f57521881cb1cfd90d1228214f9dc43b8efe6f6c6948cd8280" +dependencies = [ + "blake2b_simd 0.5.11", + "byteorder", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "f4jumble" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75" +dependencies = [ + "blake2b_simd 1.0.2", +] + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "bitvec", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fixed-hash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rand", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fpe" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd910db5f9ca4dc3116f8c46367825807aa2b942f72565f16b4be0b208a00a9e" +dependencies = [ + "block-modes", + "cipher", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "gumdrop" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc700f989d2f6f0248546222d9b4258f5b02a171a431f8285a81c08142629e3" +dependencies = [ + "gumdrop_derive", +] + +[[package]] +name = "gumdrop_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "halo2_gadgets" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f3914f58cc4af5e4fe83d48b02d582be18976bc7e96c3151aa2bf1c98e9f60" +dependencies = [ + "arrayvec 0.7.6", + "bitvec", + "ff", + "group", + "halo2_proofs", + "lazy_static", + "pasta_curves", + "rand", + "subtle", + "uint", +] + +[[package]] +name = "halo2_proofs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760" +dependencies = [ + "blake2b_simd 1.0.2", + "ff", + "group", + "pasta_curves", + "rand_core 0.6.4", + "rayon", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "hdwallet" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd89bf343be18dbe1e505100e48168bbd084760e842a8fed0317d2361470193" +dependencies = [ + "lazy_static", + "rand_core 0.6.4", + "ring", + "secp256k1", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "incrementalmerkletree" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5ad43a3f5795945459d577f6589cf62a476e92c79b75e70cd954364e14ce17b" +dependencies = [ + "serde", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jubjub" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" +dependencies = [ + "bitvec", + "bls12_381", + "ff", + "group", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "librustzcash" +version = "0.2.0" +dependencies = [ + "anyhow", + "backtrace", + "bellman", + "blake2b_simd 1.0.2", + "blake2s_simd", + "bls12_381", + "byteorder", + "clearscreen", + "ed25519-zebra", + "group", + "gumdrop", + "incrementalmerkletree", + "ipnet", + "jubjub", + "libc", + "memuse", + "metrics", + "metrics-exporter-prometheus", + "nonempty", + "orchard", + "rand", + "rand_core 0.6.4", + "secp256k1", + "secrecy", + "subtle", + "thiserror", + "time", + "tracing", + "tracing-appender", + "tracing-core", + "tracing-subscriber", + "zcash_address", + "zcash_encoding", + "zcash_history", + "zcash_note_encryption", + "zcash_primitives", + "zcash_proofs", + "zeroize", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memuse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2145869435ace5ea6ea3d35f59be559317ec9a0d04e1812d5f185a87b6d36f1a" +dependencies = [ + "nonempty", +] + +[[package]] +name = "metrics" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827" +dependencies = [ + "ahash", + "metrics-macros", +] + +[[package]] +name = "metrics-exporter-prometheus" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343a5ceb38235928e7a5687412590f07e6d281522dcd9ff51246f8856eef5fe5" +dependencies = [ + "hyper", + "ipnet", + "metrics", + "metrics-util", + "parking_lot", + "quanta", + "thiserror", + "tokio", +] + +[[package]] +name = "metrics-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0daa0ab3a0ae956d0e2c1f42511422850e577d36a255357d1a7d08d45ee3a2f1" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "metrics-util" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1174223789e331d9d47a4a953dac36e397db60fa8d2a111ac505388c6c7fe32e" +dependencies = [ + "ahash", + "aho-corasick 0.7.20", + "atomic-shim", + "crossbeam-epoch", + "crossbeam-utils", + "dashmap", + "hashbrown 0.11.2", + "indexmap 1.9.3", + "metrics", + "num_cpus", + "ordered-float", + "parking_lot", + "quanta", + "radix_trie", + "sketches-ddsketch", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "5.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "orchard" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f918076e191a68d55c5517a16e075ecfe58fc63ed112408263f3d6194597bfcf" +dependencies = [ + "aes", + "bitvec", + "blake2b_simd 1.0.2", + "ff", + "fpe", + "group", + "halo2_gadgets", + "halo2_proofs", + "hex", + "incrementalmerkletree", + "lazy_static", + "memuse", + "nonempty", + "pasta_curves", + "rand", + "reddsa", + "serde", + "subtle", + "zcash_note_encryption", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" +dependencies = [ + "group", +] + +[[package]] +name = "parity-scale-codec" +version = "3.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +dependencies = [ + "arrayvec 0.7.6", + "bitvec", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "3.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "password-hash" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "pasta_curves" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8" +dependencies = [ + "blake2b_simd 1.0.2", + "ff", + "group", + "lazy_static", + "rand", + "static_assertions", + "subtle", +] + +[[package]] +name = "pbkdf2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" +dependencies = [ + "crypto-mac", + "password-hash", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "poly1305" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primitive-types" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +dependencies = [ + "fixed-hash", + "impl-codec", + "uint", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quanta" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.2+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "reddsa" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cc8038c8b7e481bdf688d0585d4897ed0e9e0cee10aa365dde51238c20e4182" +dependencies = [ + "blake2b_simd 1.0.2", + "byteorder", + "group", + "jubjub", + "pasta_curves", + "rand_core 0.6.4", + "serde", + "thiserror", + "zeroize", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "zeroize", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sketches-ddsketch" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "terminfo" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +dependencies = [ + "dirs", + "fnv", + "nom", + "phf", + "phf_codegen", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.6.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "time", + "tracing", + "tracing-core", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uint" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "zcash_address" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1322a31b757f0087f110cc4a85dc5c6ccf83d0533bac04c4d3d1ce9112cc602" +dependencies = [ + "bech32", + "bs58", + "f4jumble", + "zcash_encoding", +] + +[[package]] +name = "zcash_encoding" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb61ea88eb539bc0ac2068e5da99411dd4978595b3d7ff6a4b1562ddc8e8710" +dependencies = [ + "byteorder", + "nonempty", +] + +[[package]] +name = "zcash_history" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb611a28a4e13ac715ee712f4344d6b279b767daf6345dafefb2c4bf582b6679" +dependencies = [ + "blake2b_simd 1.0.2", + "byteorder", + "primitive-types", +] + +[[package]] +name = "zcash_note_encryption" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f84ae538f05a8ac74c82527f06b77045ed9553a0871d9db036166a4c344e3a" +dependencies = [ + "chacha20", + "chacha20poly1305", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "zcash_primitives" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb1ef5719fb24b42450dcd6b10e6155793be5668f0d962ad8132b6e4d108635" +dependencies = [ + "aes", + "bip0039", + "bitvec", + "blake2b_simd 1.0.2", + "blake2s_simd", + "bls12_381", + "bs58", + "byteorder", + "chacha20poly1305", + "equihash", + "ff", + "fpe", + "group", + "hdwallet", + "hex", + "incrementalmerkletree", + "jubjub", + "lazy_static", + "memuse", + "nonempty", + "orchard", + "rand", + "rand_core 0.6.4", + "ripemd", + "secp256k1", + "sha2", + "subtle", + "zcash_encoding", + "zcash_note_encryption", +] + +[[package]] +name = "zcash_proofs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e67054525b4897a97386ce562240f08ac9bcad07183130fe8d797224d712112d" +dependencies = [ + "bellman", + "blake2b_simd 1.0.2", + "bls12_381", + "byteorder", + "directories", + "ff", + "group", + "jubjub", + "lazy_static", + "rand_core 0.6.4", + "zcash_primitives", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] diff --git a/src/rust_deps/librustzcash/Cargo.toml b/src/rustzcash_deps/Cargo.toml similarity index 97% rename from src/rust_deps/librustzcash/Cargo.toml rename to src/rustzcash_deps/Cargo.toml index 8aafb940b44b..f1f395eaaa68 100644 --- a/src/rust_deps/librustzcash/Cargo.toml +++ b/src/rustzcash_deps/Cargo.toml @@ -23,7 +23,7 @@ rust-version = "1.59" [lib] name = "rustzcash" path = "src/rustzcash.rs" -crate-type = ["staticlib", "rlib"] +crate-type = ["staticlib", "rlib", "cdylib"] [[bin]] name = "zcashd-wallet-tool" diff --git a/src/rust_deps/librustzcash/README.md b/src/rustzcash_deps/README.md similarity index 100% rename from src/rust_deps/librustzcash/README.md rename to src/rustzcash_deps/README.md diff --git a/src/rust_deps/librustzcash/bin/wallet_tool.rs b/src/rustzcash_deps/bin/wallet_tool.rs similarity index 100% rename from src/rust_deps/librustzcash/bin/wallet_tool.rs rename to src/rustzcash_deps/bin/wallet_tool.rs diff --git a/src/rustzcash_deps/build.sh b/src/rustzcash_deps/build.sh new file mode 100755 index 000000000000..4446c759e676 --- /dev/null +++ b/src/rustzcash_deps/build.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2024 TriliTech +# +# SPDX-License-Identifier: MIT + +# This is a build script to be used in the Dune rule to make writing the rule less difficult. + +# Ensure that failures bubble up. +set -e + +OUT_DIR=$(dirname "$0") +CARGO_TARGET_DIR="${OCTEZ_RUST_DEPS_TARGET_DIR:-$OUT_DIR/target}" + +# Make sure the subsequent processes have access to these. +export OCTEZ_RUST_DEPS_NO_WASMER_HEADERS=1 +export CARGO_TARGET_DIR + +# Build the Rust project. +cargo build --release --locked --target-dir="$CARGO_TARGET_DIR" + +# Copy the built artifacts to the output directory. +cp -f "$CARGO_TARGET_DIR/release/librustzcash.a" "$OUT_DIR/liboctez_rustzcash_deps.a" + +if [[ -r "$CARGO_TARGET_DIR/release/librustzcash.so" ]]; then + cp -f "$CARGO_TARGET_DIR/release/librustzcash.so" "$OUT_DIR/dlloctez_rustzcash_deps.so" +fi + +if [[ -r "$CARGO_TARGET_DIR/release/librustzcash.dylib" ]]; then + cp -f "$CARGO_TARGET_DIR/release/librustzcash.dylib" "$OUT_DIR/dlloctez_rustzcash_deps.so" +fi diff --git a/src/rustzcash_deps/dune b/src/rustzcash_deps/dune new file mode 100644 index 000000000000..9c60b89c8e80 --- /dev/null +++ b/src/rustzcash_deps/dune @@ -0,0 +1,23 @@ +; This file was automatically generated, do not edit. +; Edit file manifest/main.ml instead. + +(library + (name octez_rustzcash_deps) + (public_name octez-rustzcash-deps) + (instrumentation (backend bisect_ppx)) + (foreign_archives octez_rustzcash_deps)) + +(dirs :standard .cargo (not target)) + +(rule + (targets liboctez_rustzcash_deps.a dlloctez_rustzcash_deps.so) + (deps + (file build.sh) + (file Cargo.toml) + (file Cargo.lock) + (file ../../rust-toolchain) + (source_tree .cargo) + (source_tree bin) + (source_tree include) + (source_tree src)) + (action (no-infer (bash ./build.sh)))) diff --git a/src/rust_deps/librustzcash/include/librustzcash.h b/src/rustzcash_deps/include/librustzcash.h similarity index 100% rename from src/rust_deps/librustzcash/include/librustzcash.h rename to src/rustzcash_deps/include/librustzcash.h diff --git a/src/rust_deps/librustzcash/include/rust/VA_OPT.hpp b/src/rustzcash_deps/include/rust/VA_OPT.hpp similarity index 100% rename from src/rust_deps/librustzcash/include/rust/VA_OPT.hpp rename to src/rustzcash_deps/include/rust/VA_OPT.hpp diff --git a/src/rust_deps/librustzcash/include/rust/address.h b/src/rustzcash_deps/include/rust/address.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/address.h rename to src/rustzcash_deps/include/rust/address.h diff --git a/src/rust_deps/librustzcash/include/rust/blake2b.h b/src/rustzcash_deps/include/rust/blake2b.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/blake2b.h rename to src/rustzcash_deps/include/rust/blake2b.h diff --git a/src/rust_deps/librustzcash/include/rust/builder.h b/src/rustzcash_deps/include/rust/builder.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/builder.h rename to src/rustzcash_deps/include/rust/builder.h diff --git a/src/rust_deps/librustzcash/include/rust/ed25519.h b/src/rustzcash_deps/include/rust/ed25519.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/ed25519.h rename to src/rustzcash_deps/include/rust/ed25519.h diff --git a/src/rust_deps/librustzcash/include/rust/ed25519/types.h b/src/rustzcash_deps/include/rust/ed25519/types.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/ed25519/types.h rename to src/rustzcash_deps/include/rust/ed25519/types.h diff --git a/src/rust_deps/librustzcash/include/rust/helpers.h b/src/rustzcash_deps/include/rust/helpers.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/helpers.h rename to src/rustzcash_deps/include/rust/helpers.h diff --git a/src/rust_deps/librustzcash/include/rust/history.h b/src/rustzcash_deps/include/rust/history.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/history.h rename to src/rustzcash_deps/include/rust/history.h diff --git a/src/rust_deps/librustzcash/include/rust/map.h b/src/rustzcash_deps/include/rust/map.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/map.h rename to src/rustzcash_deps/include/rust/map.h diff --git a/src/rust_deps/librustzcash/include/rust/metrics.h b/src/rustzcash_deps/include/rust/metrics.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/metrics.h rename to src/rustzcash_deps/include/rust/metrics.h diff --git a/src/rust_deps/librustzcash/include/rust/orchard.h b/src/rustzcash_deps/include/rust/orchard.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/orchard.h rename to src/rustzcash_deps/include/rust/orchard.h diff --git a/src/rust_deps/librustzcash/include/rust/orchard/incremental_merkle_tree.h b/src/rustzcash_deps/include/rust/orchard/incremental_merkle_tree.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/orchard/incremental_merkle_tree.h rename to src/rustzcash_deps/include/rust/orchard/incremental_merkle_tree.h diff --git a/src/rust_deps/librustzcash/include/rust/orchard/keys.h b/src/rustzcash_deps/include/rust/orchard/keys.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/orchard/keys.h rename to src/rustzcash_deps/include/rust/orchard/keys.h diff --git a/src/rust_deps/librustzcash/include/rust/orchard/wallet.h b/src/rustzcash_deps/include/rust/orchard/wallet.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/orchard/wallet.h rename to src/rustzcash_deps/include/rust/orchard/wallet.h diff --git a/src/rust_deps/librustzcash/include/rust/streams.h b/src/rustzcash_deps/include/rust/streams.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/streams.h rename to src/rustzcash_deps/include/rust/streams.h diff --git a/src/rust_deps/librustzcash/include/rust/test_harness.h b/src/rustzcash_deps/include/rust/test_harness.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/test_harness.h rename to src/rustzcash_deps/include/rust/test_harness.h diff --git a/src/rust_deps/librustzcash/include/rust/transaction.h b/src/rustzcash_deps/include/rust/transaction.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/transaction.h rename to src/rustzcash_deps/include/rust/transaction.h diff --git a/src/rust_deps/librustzcash/include/rust/types.h b/src/rustzcash_deps/include/rust/types.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/types.h rename to src/rustzcash_deps/include/rust/types.h diff --git a/src/rust_deps/librustzcash/include/rust/unified_keys.h b/src/rustzcash_deps/include/rust/unified_keys.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/unified_keys.h rename to src/rustzcash_deps/include/rust/unified_keys.h diff --git a/src/rust_deps/librustzcash/include/rust/zip339.h b/src/rustzcash_deps/include/rust/zip339.h similarity index 100% rename from src/rust_deps/librustzcash/include/rust/zip339.h rename to src/rustzcash_deps/include/rust/zip339.h diff --git a/src/rust_deps/librustzcash/include/tracing.h b/src/rustzcash_deps/include/tracing.h similarity index 100% rename from src/rust_deps/librustzcash/include/tracing.h rename to src/rustzcash_deps/include/tracing.h diff --git a/src/rust_deps/librustzcash/src/address_ffi.rs b/src/rustzcash_deps/src/address_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/address_ffi.rs rename to src/rustzcash_deps/src/address_ffi.rs diff --git a/src/rust_deps/librustzcash/src/blake2b.rs b/src/rustzcash_deps/src/blake2b.rs similarity index 100% rename from src/rust_deps/librustzcash/src/blake2b.rs rename to src/rustzcash_deps/src/blake2b.rs diff --git a/src/rust_deps/librustzcash/src/builder_ffi.rs b/src/rustzcash_deps/src/builder_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/builder_ffi.rs rename to src/rustzcash_deps/src/builder_ffi.rs diff --git a/src/rust_deps/librustzcash/src/ed25519.rs b/src/rustzcash_deps/src/ed25519.rs similarity index 100% rename from src/rust_deps/librustzcash/src/ed25519.rs rename to src/rustzcash_deps/src/ed25519.rs diff --git a/src/rust_deps/librustzcash/src/history_ffi.rs b/src/rustzcash_deps/src/history_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/history_ffi.rs rename to src/rustzcash_deps/src/history_ffi.rs diff --git a/src/rust_deps/librustzcash/src/incremental_merkle_tree.rs b/src/rustzcash_deps/src/incremental_merkle_tree.rs similarity index 100% rename from src/rust_deps/librustzcash/src/incremental_merkle_tree.rs rename to src/rustzcash_deps/src/incremental_merkle_tree.rs diff --git a/src/rust_deps/librustzcash/src/incremental_merkle_tree_ffi.rs b/src/rustzcash_deps/src/incremental_merkle_tree_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/incremental_merkle_tree_ffi.rs rename to src/rustzcash_deps/src/incremental_merkle_tree_ffi.rs diff --git a/src/rust_deps/librustzcash/src/metrics_ffi.rs b/src/rustzcash_deps/src/metrics_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/metrics_ffi.rs rename to src/rustzcash_deps/src/metrics_ffi.rs diff --git a/src/rust_deps/librustzcash/src/orchard_ffi.rs b/src/rustzcash_deps/src/orchard_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/orchard_ffi.rs rename to src/rustzcash_deps/src/orchard_ffi.rs diff --git a/src/rust_deps/librustzcash/src/orchard_keys_ffi.rs b/src/rustzcash_deps/src/orchard_keys_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/orchard_keys_ffi.rs rename to src/rustzcash_deps/src/orchard_keys_ffi.rs diff --git a/src/rust_deps/librustzcash/src/rustzcash.rs b/src/rustzcash_deps/src/rustzcash.rs similarity index 100% rename from src/rust_deps/librustzcash/src/rustzcash.rs rename to src/rustzcash_deps/src/rustzcash.rs diff --git a/src/rust_deps/librustzcash/src/streams_ffi.rs b/src/rustzcash_deps/src/streams_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/streams_ffi.rs rename to src/rustzcash_deps/src/streams_ffi.rs diff --git a/src/rust_deps/librustzcash/src/test_harness_ffi.rs b/src/rustzcash_deps/src/test_harness_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/test_harness_ffi.rs rename to src/rustzcash_deps/src/test_harness_ffi.rs diff --git a/src/rust_deps/librustzcash/src/tests/key_agreement.rs b/src/rustzcash_deps/src/tests/key_agreement.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/key_agreement.rs rename to src/rustzcash_deps/src/tests/key_agreement.rs diff --git a/src/rust_deps/librustzcash/src/tests/key_components.rs b/src/rustzcash_deps/src/tests/key_components.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/key_components.rs rename to src/rustzcash_deps/src/tests/key_components.rs diff --git a/src/rust_deps/librustzcash/src/tests/mmr.rs b/src/rustzcash_deps/src/tests/mmr.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/mmr.rs rename to src/rustzcash_deps/src/tests/mmr.rs diff --git a/src/rust_deps/librustzcash/src/tests/mod.rs b/src/rustzcash_deps/src/tests/mod.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/mod.rs rename to src/rustzcash_deps/src/tests/mod.rs diff --git a/src/rust_deps/librustzcash/src/tests/notes.rs b/src/rustzcash_deps/src/tests/notes.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/notes.rs rename to src/rustzcash_deps/src/tests/notes.rs diff --git a/src/rust_deps/librustzcash/src/tests/res/tree1023.dat b/src/rustzcash_deps/src/tests/res/tree1023.dat similarity index 100% rename from src/rust_deps/librustzcash/src/tests/res/tree1023.dat rename to src/rustzcash_deps/src/tests/res/tree1023.dat diff --git a/src/rust_deps/librustzcash/src/tests/res/tree16.dat b/src/rustzcash_deps/src/tests/res/tree16.dat similarity index 100% rename from src/rust_deps/librustzcash/src/tests/res/tree16.dat rename to src/rustzcash_deps/src/tests/res/tree16.dat diff --git a/src/rust_deps/librustzcash/src/tests/signatures.rs b/src/rustzcash_deps/src/tests/signatures.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/signatures.rs rename to src/rustzcash_deps/src/tests/signatures.rs diff --git a/src/rust_deps/librustzcash/src/tests/zip339.rs b/src/rustzcash_deps/src/tests/zip339.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tests/zip339.rs rename to src/rustzcash_deps/src/tests/zip339.rs diff --git a/src/rust_deps/librustzcash/src/tracing_ffi.rs b/src/rustzcash_deps/src/tracing_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/tracing_ffi.rs rename to src/rustzcash_deps/src/tracing_ffi.rs diff --git a/src/rust_deps/librustzcash/src/transaction_ffi.rs b/src/rustzcash_deps/src/transaction_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/transaction_ffi.rs rename to src/rustzcash_deps/src/transaction_ffi.rs diff --git a/src/rust_deps/librustzcash/src/unified_keys_ffi.rs b/src/rustzcash_deps/src/unified_keys_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/unified_keys_ffi.rs rename to src/rustzcash_deps/src/unified_keys_ffi.rs diff --git a/src/rust_deps/librustzcash/src/wallet.rs b/src/rustzcash_deps/src/wallet.rs similarity index 100% rename from src/rust_deps/librustzcash/src/wallet.rs rename to src/rustzcash_deps/src/wallet.rs diff --git a/src/rust_deps/librustzcash/src/zcashd_orchard.rs b/src/rustzcash_deps/src/zcashd_orchard.rs similarity index 100% rename from src/rust_deps/librustzcash/src/zcashd_orchard.rs rename to src/rustzcash_deps/src/zcashd_orchard.rs diff --git a/src/rust_deps/librustzcash/src/zip339_ffi.rs b/src/rustzcash_deps/src/zip339_ffi.rs similarity index 100% rename from src/rust_deps/librustzcash/src/zip339_ffi.rs rename to src/rustzcash_deps/src/zip339_ffi.rs diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 2a8089e5601e..c1eaa41cde8b 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive tezt tezt-tezos diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index d112a3f6f93a..08ee2c054c4a 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive octez-libs.test-helpers octez-libs.tezt-wrapper diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index a5b1cb01e874..cfb12146c4bb 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -6,7 +6,6 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive tezt tezt-tezos) diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index ab282df705aa..f6c64ceec4b3 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rust-deps + octez-rustzcash-deps bls12-381.archive tezt tezt-tezos -- GitLab