From eca453ee23553202063dc253223c10af61a70090 Mon Sep 17 00:00:00 2001 From: Felix Puscasu Date: Fri, 17 Jan 2025 16:25:13 +0200 Subject: [PATCH 1/2] Proto/RISC-V: Reorder riscv library definitions --- manifest/product_octez.ml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index aad0b7f78115..82b0ada11da6 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -3261,6 +3261,23 @@ let _octez_sapling_ctypes_gen = ~deps:[ctypes_stubs; ctypes] ~modules:["rustzcash_ctypes_gen"; "rustzcash_ctypes_bindings"] +let octez_riscv_api = + public_lib + "octez-riscv-api" + ~path:"src/lib_riscv/api" + ~synopsis:"OCaml API of the RISC-V Rust components" + ~flags:(Flags.standard ~disable_warnings:[9; 27; 66] ()) + ~dep_globs_rec:["../../riscv/*"] + ~modules:["octez_riscv_api"] + ~dune:Dune.[[S "copy_files"; S "../../riscv/lib/octez_riscv_api.*"]] + +let octez_riscv_pvm = + public_lib + "octez-riscv-pvm" + ~path:"src/lib_riscv/pvm" + ~synopsis:"RISC-V PVM" + ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_riscv_api] + let tezos_protocol_environment_sigs_internals = octez_proto_lib "protocol-environment.sigs-internals" @@ -4666,23 +4683,6 @@ let _octez_embedded_protocol_packer = ~linkall:true ~modules:["Main_embedded_packer"] -let octez_riscv_api = - public_lib - "octez-riscv-api" - ~path:"src/lib_riscv/api" - ~synopsis:"OCaml API of the RISC-V Rust components" - ~flags:(Flags.standard ~disable_warnings:[9; 27; 66] ()) - ~dep_globs_rec:["../../riscv/*"] - ~modules:["octez_riscv_api"] - ~dune:Dune.[[S "copy_files"; S "../../riscv/lib/octez_riscv_api.*"]] - -let octez_riscv_pvm = - public_lib - "octez-riscv-pvm" - ~path:"src/lib_riscv/pvm" - ~synopsis:"RISC-V PVM" - ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_riscv_api] - let _octez_riscv_pvm_test = tezt ["test_main"; "test_storage"] -- GitLab From c5a57776340ae84a7d9b02b33458771b77c5853c Mon Sep 17 00:00:00 2001 From: Felix Puscasu Date: Fri, 17 Jan 2025 16:25:13 +0200 Subject: [PATCH 2/2] Proto/RISC-V: Add riscv module in protocol environment Co-authored-by: Victor Dumitrescu --- 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 +- docs/protocols/alpha.rst | 2 + etherlink/lib_wasm_runtime/Cargo.lock | 641 +++++++++++++++++- etherlink/lib_wasm_runtime/Cargo.toml | 8 +- etherlink/lib_wasm_runtime/dune | 1 + etherlink/lib_wasm_runtime/src/lib.rs | 2 + etherlink/tezt/tests/dune | 2 +- manifest/product_etherlink.ml | 3 +- manifest/product_octez.ml | 117 ++-- opam/internal-devtools_proto-context-du.opam | 2 +- opam/octez-accuser-alpha.opam | 2 +- opam/octez-baker-alpha.opam | 2 +- opam/octez-client.opam | 2 +- opam/octez-codec.opam | 2 +- opam/octez-dal-node.opam | 2 +- opam/octez-experimental-agnostic-baker.opam | 2 +- opam/octez-injector-server.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 | 2 +- opam/octez-protocol-022-PsRiotum-libs.opam | 2 +- opam/octez-protocol-alpha-libs.opam | 1 - opam/octez-shell-libs.opam | 3 +- opam/octez-shell-tests.opam | 2 +- opam/octez-snoop.opam | 2 +- opam/octez-store-tests.opam | 2 +- opam/tezos-benchmark-alpha.opam | 2 +- .../tezos-benchmark-type-inference-alpha.opam | 2 +- opam/tezos-dal-node-lib.opam | 2 +- 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.opam | 2 +- opam/tezos-protocol-021-PsQuebec.opam | 2 +- opam/tezos-protocol-022-PsRiotum.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 3 +- opam/tezos-protocol-alpha.opam | 2 +- opam/tezos-tps-evaluation.opam | 2 +- opam/tezt-etherlink.opam | 2 +- src/bin_agnostic_baker/dune | 2 +- src/bin_client/dune | 2 +- src/bin_codec/dune | 2 +- src/bin_dal_node/dune | 2 +- src/bin_node/dune | 2 +- src/bin_snoop/dune | 2 +- src/bin_tps_evaluation/dune | 2 +- .../lib_micheline_rewriting/test/dune | 2 +- src/lib_dal_node/test/dune | 2 +- src/lib_protocol_environment/dune | 1 + src/lib_shell/dune | 5 +- src/lib_shell/test/dune | 2 +- src/lib_store/unix/test/dune | 2 +- 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/lib_client/dune | 5 +- src/proto_020_PsParisC/lib_layer2_utils/dune | 5 +- src/proto_020_PsParisC/lib_parameters/dune | 2 +- src/proto_021_PsQuebec/lib_client/dune | 5 +- src/proto_021_PsQuebec/lib_dal/dune | 5 +- 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_022_PsRiotum/lib_client/dune | 5 +- src/proto_022_PsRiotum/lib_dal/dune | 5 +- src/proto_022_PsRiotum/lib_delegate/test/dune | 2 +- .../lib_delegate/test/tenderbrute/dune | 2 +- src/proto_022_PsRiotum/lib_layer2_utils/dune | 5 +- src/proto_022_PsRiotum/lib_parameters/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_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 +- tezt/long_tests/dune | 2 +- tezt/manual_tests/dune | 2 +- tezt/vesting_contract_test/dune | 2 +- 140 files changed, 849 insertions(+), 274 deletions(-) diff --git a/contrib/octez_injector_server/dune b/contrib/octez_injector_server/dune index 65283bd6b20c..b0dcc4a83304 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-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-injector diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index b23ba7f83552..6e6709161fc7 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -23,7 +23,7 @@ (executable (name get_contracts) (libraries - octez-rustzcash-deps + octez-rust-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 9f20a3bf5e0d..6e33d8c7d74c 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-rustzcash-deps + octez-rust-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 b459f17effa5..d65a6e9d7f6b 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -4,7 +4,7 @@ (executable (name testnet_experiment_tools) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive tezt tezt-tezos @@ -68,7 +68,7 @@ (executable (name simulation_scenario) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.stdlib-unix octez-libs.base @@ -102,7 +102,7 @@ (executable (name extract_data) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix @@ -124,7 +124,7 @@ (executable (name safety_checker) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-shell-libs.store @@ -149,7 +149,7 @@ (executable (name get_teztale_data) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.clic diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 3cc61fbd249b..77fd9376a189 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -22,7 +22,7 @@ (executable (name yes_wallet) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive yes_wallet_lib) (link_flags diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 766ee8890b74..ec2e7f6f32b5 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -4,7 +4,7 @@ (executables (names rpc_doc p2p_doc) (libraries - octez-rustzcash-deps + octez-rust-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 214021838fd4..697da9724109 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -4,7 +4,7 @@ (executable (name error_doc) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.error-monad diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index 9cc4852b8c7f..05ceaee48a6f 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -54,3 +54,5 @@ Minor Changes Internal -------- + +- Added ``octez_riscv_pvm`` as a dependency for the protocol environment (:gl:`!15918`) diff --git a/etherlink/lib_wasm_runtime/Cargo.lock b/etherlink/lib_wasm_runtime/Cargo.lock index 2ec2514afb5a..65c99b41372e 100644 --- a/etherlink/lib_wasm_runtime/Cargo.lock +++ b/etherlink/lib_wasm_runtime/Cargo.lock @@ -49,6 +49,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -223,6 +235,18 @@ version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +[[package]] +name = "arbitrary" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" + +[[package]] +name = "arbitrary-int" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b1df46d" + [[package]] name = "arrayref" version = "0.3.9" @@ -337,6 +361,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "binary-merge" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bip0039" version = "0.9.0" @@ -577,6 +616,46 @@ dependencies = [ "generic-array", ] +[[package]] +name = "clap" +version = "4.5.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + [[package]] name = "clearscreen" version = "1.0.11" @@ -615,6 +694,12 @@ dependencies = [ "serde", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -655,15 +740,41 @@ dependencies = [ "libc", ] +[[package]] +name = "cranelift" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb72c66542d7161e8fde2084f5a6ed18a1eddef515463d43450e93a1fa46f62a" +dependencies = [ + "cranelift-codegen 0.111.2", + "cranelift-frontend 0.111.2", + "cranelift-module", +] + [[package]] name = "cranelift-bforest" version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.91.1", ] +[[package]] +name = "cranelift-bforest" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f823c6662ea77699089ec8b6b4b8a23c1e1a9c6526a6420ede7ac957274a7ab4" +dependencies = [ + "cranelift-entity 0.111.2", +] + +[[package]] +name = "cranelift-bitset" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fcbb4187005097204458a8e4309bb9e737933477e47b4609f81b07a5b4cdd25" + [[package]] name = "cranelift-codegen" version = "0.91.1" @@ -672,15 +783,38 @@ checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ "arrayvec 0.7.6", "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", + "cranelift-bforest 0.91.1", + "cranelift-codegen-meta 0.91.1", + "cranelift-codegen-shared 0.91.1", "cranelift-egraph", - "cranelift-entity", - "cranelift-isle", + "cranelift-entity 0.91.1", + "cranelift-isle 0.91.1", "gimli 0.26.2", "log", - "regalloc2", + "regalloc2 0.5.1", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd1aaf8e88339f4f95afffd60d22033546ec7da4d79e805b85260a16668f78f" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.111.2", + "cranelift-bitset", + "cranelift-codegen-meta 0.111.2", + "cranelift-codegen-shared 0.111.2", + "cranelift-control", + "cranelift-entity 0.111.2", + "cranelift-isle 0.111.2", + "gimli 0.29.0", + "hashbrown 0.14.5", + "log", + "regalloc2 0.9.3", + "rustc-hash", "smallvec", "target-lexicon", ] @@ -691,7 +825,16 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.91.1", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e541b0418bbba3ce82040a445bd9a83bf3e0da604a95178d9e949dc8a7840af" +dependencies = [ + "cranelift-codegen-shared 0.111.2", ] [[package]] @@ -700,13 +843,28 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" +[[package]] +name = "cranelift-codegen-shared" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc96a709a30be39d53ecf89dbfe4edcc5adba528d4b65f7e58dc867ba70fab" + +[[package]] +name = "cranelift-control" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3bfcb035e0a501323896bb7ea3d7a5dd1fac3e92dda458ccd23960fde12c88" +dependencies = [ + "arbitrary", +] + [[package]] name = "cranelift-egraph" version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.91.1", "fxhash", "hashbrown 0.12.3", "indexmap 1.9.3", @@ -720,13 +878,34 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" +[[package]] +name = "cranelift-entity" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f00b4eba51d73a8c343c45cfdeeffa1f74f423bba0e6b8e290e646777c2b81" +dependencies = [ + "cranelift-bitset", +] + [[package]] name = "cranelift-frontend" version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.91.1", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52d5e18bf04660bb716dacf45809e2d4c85e7111701e27dbdb75b4634504ad8f" +dependencies = [ + "cranelift-codegen 0.111.2", "log", "smallvec", "target-lexicon", @@ -738,6 +917,54 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "cranelift-isle" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f9901807b6d0fde1205f0e4db9d96dcf7ddfc1894c69eb2ff93c47ebf2439f" + +[[package]] +name = "cranelift-jit" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5c8d857140cc9789a4e61d284b2a2ec5ab6c6ca2d6964e21bcf858f4a4515a" +dependencies = [ + "anyhow", + "cranelift-codegen 0.111.2", + "cranelift-control", + "cranelift-entity 0.111.2", + "cranelift-module", + "cranelift-native", + "libc", + "log", + "region 2.2.0", + "target-lexicon", + "wasmtime-jit-icache-coherence", + "windows-sys 0.52.0", +] + +[[package]] +name = "cranelift-module" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f897bea8356260efe03526c27f9751736657ba119cd58ecb6779efaad7f3e17e" +dependencies = [ + "anyhow", + "cranelift-codegen 0.111.2", + "cranelift-control", +] + +[[package]] +name = "cranelift-native" +version = "0.111.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "967d65a4077726a9afc3f4694e037f34b992cbe2b6c48ce519b714a0b0558f97" +dependencies = [ + "cranelift-codegen 0.111.2", + "libc", + "target-lexicon", +] + [[package]] name = "crc32fast" version = "1.4.2" @@ -867,6 +1094,7 @@ dependencies = [ "fiat-crypto", "rustc_version", "subtle", + "zeroize", ] [[package]] @@ -943,6 +1171,16 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.11" @@ -1099,7 +1337,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" dependencies = [ - "der", + "der 0.4.5", "elliptic-curve", "hmac 0.11.0", "signature 1.3.2", @@ -1111,6 +1349,7 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature 2.2.0", ] @@ -1122,8 +1361,10 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.3", "ed25519", + "serde", "sha2 0.10.8", "subtle", + "zeroize", ] [[package]] @@ -1188,6 +1429,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-tag" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7696ca164c11153f0885c27f03654e874b052c9198f8964b015f4f675fabf390" +dependencies = [ + "enum-tag-macro", +] + +[[package]] +name = "enum-tag-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ccd72f8e71e242f71705868f5478fe7592a6e194c06330d8732421ffdbc554c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "enumset" version = "1.1.5" @@ -1496,6 +1757,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "ff" version = "0.10.1" @@ -1672,17 +1939,39 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +dependencies = [ + "fallible-iterator 0.3.0", + "indexmap 2.7.1", + "stable_deref_trait", +] + [[package]] name = "gimli" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "goblin" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" +dependencies = [ + "log", + "plain", + "scroll", +] + [[package]] name = "group" version = "0.10.0" @@ -1778,7 +2067,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] @@ -1787,7 +2076,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.11", ] [[package]] @@ -2108,6 +2406,15 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "ieee-apsqrt" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4328941c554aaeea28ca420cd1f10e932fa38874faf8c75e3ed184c64c5c6cec" +dependencies = [ + "rustc_apfloat", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -2166,6 +2473,15 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "inplace-vec-builder" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" +dependencies = [ + "smallvec", +] + [[package]] name = "instant" version = "0.1.13" @@ -2187,6 +2503,15 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -2450,7 +2775,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827" dependencies = [ - "ahash", + "ahash 0.7.8", "metrics-macros", ] @@ -2465,7 +2790,7 @@ dependencies = [ "metrics", "metrics-util", "parking_lot", - "quanta", + "quanta 0.9.3", "thiserror", "tokio", ] @@ -2489,7 +2814,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1174223789e331d9d47a4a953dac36e397db60fa8d2a111ac505388c6c7fe32e" dependencies = [ - "ahash", + "ahash 0.7.8", "aho-corasick 0.7.20", "atomic-shim", "crossbeam-epoch", @@ -2501,7 +2826,7 @@ dependencies = [ "num_cpus", "ordered-float", "parking_lot", - "quanta", + "quanta 0.9.3", "radix_trie", "sketches-ddsketch", ] @@ -2696,6 +3021,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "object" version = "0.36.7" @@ -2769,6 +3115,7 @@ dependencies = [ "log", "ocaml", "ocaml-build", + "octez-riscv", "tezos-evm-runtime-bifrost", "tezos-evm-runtime-calypso", "tezos-smart-rollup-core", @@ -2778,6 +3125,40 @@ dependencies = [ "wasmer-compiler-cranelift", ] +[[package]] +name = "octez-riscv" +version = "0.0.0" +dependencies = [ + "arbitrary-int", + "bincode", + "cranelift", + "cranelift-jit", + "cranelift-module", + "cranelift-native", + "derive_more 0.99.18", + "ed25519-dalek", + "enum-tag", + "goblin", + "hex", + "ieee-apsqrt", + "itertools", + "num_enum", + "ocaml", + "ocaml-build", + "paste", + "range-collections", + "rustc_apfloat", + "serde", + "serde_json", + "sha2 0.10.8", + "strum 0.26.3", + "tezos-smart-rollup-constants", + "tezos-smart-rollup-utils", + "tezos_crypto_rs", + "thiserror", + "vm-fdt", +] + [[package]] name = "once_cell" version = "1.20.2" @@ -3045,6 +3426,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.9", + "spki", +] + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "poly1305" version = "0.7.2" @@ -3203,12 +3600,27 @@ dependencies = [ "libc", "mach", "once_cell", - "raw-cpuid", + "raw-cpuid 10.7.0", "wasi 0.10.2+wasi-snapshot-preview1", "web-sys", "winapi", ] +[[package]] +name = "quanta" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid 11.3.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quote" version = "1.0.38" @@ -3309,6 +3721,18 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "range-collections" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537" +dependencies = [ + "binary-merge", + "inplace-vec-builder", + "ref-cast", + "smallvec", +] + [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3318,6 +3742,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "raw-cpuid" +version = "11.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" +dependencies = [ + "bitflags 2.7.0", +] + [[package]] name = "rayon" version = "1.10.0" @@ -3384,6 +3817,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "regalloc2" version = "0.5.1" @@ -3396,6 +3849,19 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.11.1" @@ -3440,6 +3906,18 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "region" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" +dependencies = [ + "bitflags 1.3.2", + "libc", + "mach", + "winapi", +] + [[package]] name = "region" version = "3.0.2" @@ -3578,12 +4056,28 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hex" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_apfloat" +version = "0.2.2+llvm-462a31f5a5ab" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121e2195ff969977a4e2b5c9965ea867fce7e4cb5aee5b09dee698a7932d574f" +dependencies = [ + "bitflags 2.7.0", + "smallvec", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -3670,6 +4164,26 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "sct" version = "0.7.1" @@ -3848,6 +4362,9 @@ name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core 0.6.4", +] [[package]] name = "simdutf8" @@ -3907,6 +4424,16 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der 0.7.9", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3919,12 +4446,27 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + [[package]] name = "strum_macros" version = "0.20.1" @@ -3937,6 +4479,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.96", +] + [[package]] name = "substrate-bn" version = "0.6.0" @@ -4258,6 +4813,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "tezos-smart-rollup-utils" +version = "0.2.2" +dependencies = [ + "clap", + "hex", + "quanta 0.12.5", + "serde", + "serde_json", + "tezos-smart-rollup-build-utils", + "tezos-smart-rollup-encoding", + "tezos-smart-rollup-mock", + "tezos_crypto_rs", + "tezos_data_encoding", +] + [[package]] name = "tezos-storage-bifrost" version = "0.1.0" @@ -4309,8 +4880,8 @@ dependencies = [ "p256", "rand 0.7.3", "serde", - "strum", - "strum_macros", + "strum 0.20.0", + "strum_macros 0.20.1", "tezos_data_encoding", "thiserror", "zeroize", @@ -4737,6 +5308,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vm-fdt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e21282841a059bb62627ce8441c491f09603622cd5a21c43bfedc85a2952f23" + [[package]] name = "want" version = "0.3.1" @@ -4872,7 +5449,7 @@ dependencies = [ "leb128", "memmap2", "more-asserts", - "region", + "region 3.0.2", "smallvec", "thiserror", "wasmer-types", @@ -4885,9 +5462,9 @@ dependencies = [ name = "wasmer-compiler-cranelift" version = "3.3.0" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.91.1", + "cranelift-entity 0.91.1", + "cranelift-frontend 0.91.1", "gimli 0.26.2", "more-asserts", "rayon", @@ -4940,7 +5517,7 @@ dependencies = [ "mach", "memoffset", "more-asserts", - "region", + "region 3.0.2", "scopeguard", "thiserror", "wasmer-types", @@ -4957,6 +5534,18 @@ dependencies = [ "url", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "24.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c543f7ee7b1ec8f2215f88197a40f9fa3452dc98c5902c5c700d8ec9e9ea7021" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "web-sys" version = "0.3.76" diff --git a/etherlink/lib_wasm_runtime/Cargo.toml b/etherlink/lib_wasm_runtime/Cargo.toml index 6dbe40b8a87d..2130fa80461b 100644 --- a/etherlink/lib_wasm_runtime/Cargo.toml +++ b/etherlink/lib_wasm_runtime/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "octez-evm-node-wasm-runtime" version = "0.0.0-dev" -authors = [ "Etherlink Core Engineers " ] +authors = ["Etherlink Core Engineers "] edition = "2021" [lib] @@ -13,11 +13,15 @@ ocaml-build = { version = "1.*", features = ["dune"] } [dependencies] hex = "*" ocaml = { version = "1.1.0" } -wasmer = { path = "../../src/rust_deps/wasmer-3.3.0/lib/api", default-features = false, features = ["cranelift", "jit"] } +wasmer = { path = "../../src/rust_deps/wasmer-3.3.0/lib/api", default-features = false, features = [ + "cranelift", + "jit", +] } wasmer-compiler-cranelift = { path = "../../src/rust_deps/wasmer-3.3.0/lib/compiler-cranelift" } tezos_crypto_rs = { version = "0.6", path = "../../sdk/rust/crypto", default-features = false } log = "0.4" env_logger = "0.11" +octez-riscv = { path = "../../src/riscv/lib", features = ["ocaml-api"] } librustzcash = { path = "../../src/rustzcash_deps" } tezos-smart-rollup-core = { path = "../../src/kernel_sdk/core" } tezos-smart-rollup-host = { path = "../../src/kernel_sdk/host" } diff --git a/etherlink/lib_wasm_runtime/dune b/etherlink/lib_wasm_runtime/dune index e7f21cbaf105..5aeb83f66f95 100644 --- a/etherlink/lib_wasm_runtime/dune +++ b/etherlink/lib_wasm_runtime/dune @@ -22,6 +22,7 @@ (source_tree ../kernel_calypso) (source_tree ../../src/rustzcash_deps) (source_tree ../../src/rust_deps/wasmer-3.3.0) + (source_tree ../../src/riscv) (source_tree ../../src/kernel_sdk) (source_tree ../../sdk/rust) (source_tree src)) diff --git a/etherlink/lib_wasm_runtime/src/lib.rs b/etherlink/lib_wasm_runtime/src/lib.rs index 8bb39d957930..6bd860108791 100644 --- a/etherlink/lib_wasm_runtime/src/lib.rs +++ b/etherlink/lib_wasm_runtime/src/lib.rs @@ -1,5 +1,7 @@ // SPDX-FileCopyrightText: 2024 Nomadic Labs +// SPDX-FileCopyrightText: 2025 TriliTech +pub use octez_riscv::ocaml_api::*; pub use rustzcash::*; pub mod api; diff --git a/etherlink/tezt/tests/dune b/etherlink/tezt/tests/dune index 9fd3f1294f38..bf8897654917 100644 --- a/etherlink/tezt/tests/dune +++ b/etherlink/tezt/tests/dune @@ -12,7 +12,7 @@ tezt-tezos tezt_etherlink octez-evm-node-libs.evm_node_lib_dev_encoding - octez-rustzcash-deps + octez-rust-deps tezos-protocol-alpha.protocol) (preprocess (staged_pps ppx_import ppx_deriving.show)) (library_flags (:standard -linkall)) diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index b72c6d10a6ac..ddb8caf93ce6 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -106,6 +106,7 @@ let evm_node_rust_deps = [S "source_tree"; S "../kernel_calypso"]; [S "source_tree"; S "../../src/rustzcash_deps"]; [S "source_tree"; S "../../src/rust_deps/wasmer-3.3.0"]; + [S "source_tree"; S "../../src/riscv"]; [S "source_tree"; S "../../src/kernel_sdk"]; [S "source_tree"; S "../../sdk/rust"]; [S "source_tree"; S "src"]; @@ -378,7 +379,7 @@ let _tezt_etherlink = tezt_tezos |> open_ |> open_ ~m:"Runnable.Syntax"; tezt_etherlink |> open_; evm_node_lib_dev_encoding; - octez_rustzcash_deps; + octez_rust_deps; Protocol.(main alpha); ] ~with_macos_security_framework:true diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 82b0ada11da6..9ee00634beb4 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -3358,6 +3358,7 @@ let octez_protocol_environment = octez_context_memory; octez_context_brassaia_memory; octez_scoru_wasm; + octez_riscv_pvm; octez_event_logging; octez_profiler |> open_; ] @@ -3997,9 +3998,8 @@ let octez_shell = Dune. [[S "package"; S "octez-shell-libs"]; [S "mld_files"; S "octez_shell"]] ~inline_tests:ppx_expect - ~inline_tests_libraries:[octez_rustzcash_deps; bls12_381_archive] - ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] + ~inline_tests_libraries:[octez_rust_deps; bls12_381_archive] + ~inline_tests_link_flags:["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] ~preprocess ~preprocessor_deps ~deps: @@ -4867,7 +4867,7 @@ let _octez_dal_node_lib_test = ~preprocess:(ppses [ppx_hash; bam_ppx]) ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; octez_stdlib |> open_; octez_stdlib_unix |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -5602,6 +5602,13 @@ end = struct if should_use_infix then open_ ~m:"TzPervasives.Error_monad_legacy" else fun target -> target + type 't minimal_rust_deps = {lib : 't; link_flag : string} + + let make_minimal_rust_deps number : 't minimal_rust_deps = + if N.(number >= 023) then + {lib = octez_rust_deps; link_flag = "-loctez_rust_deps"} + else {lib = octez_rustzcash_deps; link_flag = "-loctez_rustzcash_deps"} + module Lib_protocol = struct type t = {main : target; lifted : target; embedded : target} @@ -5636,6 +5643,7 @@ end = struct ] |> conditional_list in + let minimal_rust_deps = make_minimal_rust_deps number in let _integration_consensus = tezt modules @@ -5644,7 +5652,7 @@ end = struct ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5663,7 +5671,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5719,7 +5727,7 @@ end = struct ]) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5762,7 +5770,7 @@ end = struct ~dep_globs:(conditional_list [("contracts/*", N.(number >= 013))]) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; alcotezt; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5794,7 +5802,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; alcotezt |> if_ N.(number <= 018); octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -5836,7 +5844,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; (if N.(number >= 015) then Some tezt_lib else None) |> if_some; alcotezt |> if_ N.(number <= 018); octez_base |> open_ ~m:"TzPervasives" @@ -5885,7 +5893,7 @@ end = struct ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; octez_base |> if_ N.(number <= 14) |> open_ ~m:"TzPervasives" @@ -5999,7 +6007,7 @@ end = struct ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; octez_base |> open_ ~m:"TzPervasives"; tezt_tezos |> open_; main |> open_; @@ -6452,6 +6460,7 @@ let hash = Protocol.hash let both o1 o2 = match (o1, o2) with Some x, Some y -> Some (x, y) | _, _ -> None in + let minimal_rust_deps = make_minimal_rust_deps number in let {Lib_protocol.main; lifted; embedded} = Lib_protocol.make ~name ~status in @@ -6505,7 +6514,7 @@ let hash = Protocol.hash ~opam:(sf "tezos-protocol-%s" name_dash) ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; parameters |> open_; @@ -6628,13 +6637,11 @@ 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_rustzcash_deps] - else None) + ( only_if N.(number >= 009) @@ fun () -> + [bls12_381_archive; octez_rust_deps] ) ?inline_tests_link_flags: - (if N.(number >= 009) then - Some ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] - else None) + ( only_if N.(number >= 009) @@ fun () -> + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] ) ~linkall:true ~dune: (if N.(number >= 016) then @@ -6688,7 +6695,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_base_test_helpers |> open_; @@ -6718,7 +6725,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_micheline |> open_; @@ -6902,7 +6909,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018) @@ -6950,7 +6957,7 @@ let hash = Protocol.hash ~opam:(sf "octez-protocol-%s-libs" name_dash) ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); octez_protocol_environment |> if_ N.(number <= 011); @@ -7035,7 +7042,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); @@ -7066,9 +7073,9 @@ let hash = Protocol.hash client |> if_some |> open_; ] ~inline_tests:ppx_expect - ~inline_tests_libraries:[bls12_381_archive; octez_rustzcash_deps] + ~inline_tests_libraries:[bls12_381_archive; octez_rust_deps] ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] ~linkall:true in let dal = @@ -7093,9 +7100,9 @@ let hash = Protocol.hash main |> open_; ] ~inline_tests:ppx_expect - ~inline_tests_libraries:[bls12_381_archive; octez_rustzcash_deps] + ~inline_tests_libraries:[bls12_381_archive; octez_rust_deps] ~inline_tests_link_flags: - ["-cclib"; "-lblst"; "-cclib"; "-loctez_rustzcash_deps"] + ["-cclib"; "-lblst"; "-cclib"; "-loctez_rust_deps"] ~linkall:true ~dune:[dune_signatures_version_rule] in @@ -7108,7 +7115,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; octez_base |> open_ ~m:"TzPervasives" |> error_monad_module N.(number <= 018); dal |> if_some |> open_; @@ -7284,7 +7291,7 @@ let hash = Protocol.hash ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; bls12_381_archive; octez_micheline |> open_; octez_micheline_rewriting; @@ -7360,7 +7367,7 @@ let hash = Protocol.hash ~opam:(sf "tezos-benchmark-%s" name_dash) ~deps: [ - octez_rustzcash_deps; + minimal_rust_deps.lib; bls12_381_archive; octez_base |> error_monad_module N.(number <= 018); octez_micheline |> open_; @@ -7552,7 +7559,7 @@ let _octez_micheline_rewriting_tests = ~opam:"tezos-micheline-rewriting" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; octez_micheline |> open_; octez_micheline_rewriting; Protocol.(main alpha); @@ -7584,7 +7591,7 @@ let octez_store_tests = ~synopsis:"Store tests" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; octez_crypto |> open_; octez_context_ops |> open_; @@ -7671,7 +7678,7 @@ let _octez_shell_tests = ~synopsis:"Shell tests" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; octez_base |> open_ ~m:"TzPervasives"; octez_base_test_helpers |> open_; octez_store |> open_; @@ -7760,7 +7767,7 @@ let _get_contracts = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_micheline |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -7779,7 +7786,7 @@ let _proto_context_du = ~opam:"internal-devtools_proto-context-du" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_clic; octez_base |> open_ ~m:"TzPervasives"; @@ -7848,7 +7855,7 @@ let _yes_wallet = ~synopsis: "A script extracting delegates' keys from a context into a wallet." ~opam:"" - ~deps:[octez_rustzcash_deps; bls12_381_archive; yes_wallet_lib |> open_] + ~deps:[octez_rust_deps; bls12_381_archive; yes_wallet_lib |> open_] ~modules:["yes_wallet"] ~bisect_ppx:No @@ -7884,7 +7891,7 @@ let _testnet_experiment_tools = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos; @@ -7984,7 +7991,7 @@ let _simulation_scenario = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_stdlib_unix |> open_; octez_base |> open_ |> open_ ~m:"TzPervasives"; @@ -8012,7 +8019,7 @@ let _extract_data = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8035,7 +8042,7 @@ let _safety_checker = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_store |> open_; @@ -8059,7 +8066,7 @@ let _get_teztale_data = ~opam:"" ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ |> open_ ~m:"TzPervasives"; octez_clic; @@ -8154,7 +8161,7 @@ let _octez_node = ~preprocessor_deps ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives" |> open_; octez_base_unix |> open_; @@ -8219,7 +8226,7 @@ let _octez_experimental_agnostic_baker = ~with_macos_security_framework:true ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; data_encoding |> open_; octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -8264,7 +8271,7 @@ let _octez_client = ~release_status:Released ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8317,7 +8324,7 @@ let _octez_codec = ~with_macos_security_framework:true ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; data_encoding |> open_; octez_base |> open_ ~m:"TzPervasives"; @@ -8354,7 +8361,7 @@ let _octez_snoop = ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8389,7 +8396,7 @@ let _octez_injector_server = ~linkall:true ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_injector_lib |> open_; @@ -8494,7 +8501,7 @@ let _octez_tps_evaluation = ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; caqti; @@ -8564,7 +8571,7 @@ let _octez_dal_node = ~with_macos_security_framework:true ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; @@ -8799,7 +8806,7 @@ let _tezt_long_tests = ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_ |> open_ ~m:"Runnable.Syntax"; @@ -8825,7 +8832,7 @@ let _tezt_manual_tests = ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_test_helpers |> open_; tezt_wrapper |> open_ |> open_ ~m:"Base"; @@ -8870,7 +8877,7 @@ let _tezt_vesting_contract_test = ~with_macos_security_framework:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_; @@ -8891,7 +8898,7 @@ let _docs_doc_gen = ~release_status:Unreleased ~deps: ([ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_rpc; @@ -8917,7 +8924,7 @@ let _docs_doc_gen_errors = ~linkall:true ~deps: [ - octez_rustzcash_deps; + octez_rust_deps; bls12_381_archive; octez_base |> open_; octez_error_monad |> open_; diff --git a/opam/internal-devtools_proto-context-du.opam b/opam/internal-devtools_proto-context-du.opam index 7ae38ece0976..58d3c69a363b 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-node-config" { = version } diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 03230ed12478..3949149e445d 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "tezos-protocol-alpha" { = version } diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 5a730fd33a5c..6d4492b1641d 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-rustzcash-deps" { = version } + "octez-rust-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 66214d4fd28b..c7028c908d94 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-rustzcash-deps" { = version } + "octez-rust-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 f211dc762a70..250e7748ba13 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-shell-libs" { = version } diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index d713dfe08bd0..4348ef72823e 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "cmdliner" { >= "1.1.0" } diff --git a/opam/octez-experimental-agnostic-baker.opam b/opam/octez-experimental-agnostic-baker.opam index 5772210e7849..5375685d1f8d 100644 --- a/opam/octez-experimental-agnostic-baker.opam +++ b/opam/octez-experimental-agnostic-baker.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rustzcash-deps" { = version } + "octez-rust-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 cb60b068f947..61f278a1485f 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "octez-injector" { = version } diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 94b7adb1a1de..971a3385645c 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-rustzcash-deps" { = version } + "octez-rust-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 bed3c10428b3..43771803d174 100644 --- a/opam/octez-proto-libs.opam +++ b/opam/octez-proto-libs.opam @@ -16,6 +16,7 @@ depends: [ "class_group_vdf" { >= "0.0.4" } "aches" { >= "1.1.0" } "aches-lwt" { >= "1.1.0" } + "octez-riscv-pvm" { = version } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "octez-alcotezt" { with-test & = version } "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/octez-protocol-009-PsFLoren-libs.opam b/opam/octez-protocol-009-PsFLoren-libs.opam index 37f33914d2b0..3631c546ff7e 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 32d5f662da8c..3c0fc22bf268 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 2be064d007ed..11dfcff78759 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 6a2b527b7fde..ac3fe30a7973 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 939abb5232da..bd74d8edf817 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 3d6fe1d0b4e7..468c6a1614bc 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 6f3c92e88e42..2a3c210d6a57 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-rustzcash-deps" { with-test & = version } + "octez-rust-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 2c5ac2cc2d31..a79743c34e54 100644 --- a/opam/octez-protocol-016-PtMumbai-libs.opam +++ b/opam/octez-protocol-016-PtMumbai-libs.opam @@ -17,7 +17,6 @@ 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 c1d2a0b808a6..37e4aea4d7fe 100644 --- a/opam/octez-protocol-017-PtNairob-libs.opam +++ b/opam/octez-protocol-017-PtNairob-libs.opam @@ -17,7 +17,6 @@ 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 ee685eb79773..4f8c614c3708 100644 --- a/opam/octez-protocol-018-Proxford-libs.opam +++ b/opam/octez-protocol-018-Proxford-libs.opam @@ -17,7 +17,6 @@ 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 f64d5b5e8a57..b180b64187b5 100644 --- a/opam/octez-protocol-019-PtParisB-libs.opam +++ b/opam/octez-protocol-019-PtParisB-libs.opam @@ -17,7 +17,6 @@ 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 23c9a96f1f9e..8b00514ba695 100644 --- a/opam/octez-protocol-020-PsParisC-libs.opam +++ b/opam/octez-protocol-020-PsParisC-libs.opam @@ -17,7 +17,6 @@ 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-021-PsQuebec-libs.opam b/opam/octez-protocol-021-PsQuebec-libs.opam index 9a36c613f879..21608311b451 100644 --- a/opam/octez-protocol-021-PsQuebec-libs.opam +++ b/opam/octez-protocol-021-PsQuebec-libs.opam @@ -17,7 +17,6 @@ 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" } @@ -32,6 +31,7 @@ depends: [ "tezos-dal-node-lib" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } + "octez-rustzcash-deps" { with-test & = version } "octez-alcotezt" { with-test & = version } ] build: [ diff --git a/opam/octez-protocol-022-PsRiotum-libs.opam b/opam/octez-protocol-022-PsRiotum-libs.opam index 691c5ac0754f..e99eb6f2bf97 100644 --- a/opam/octez-protocol-022-PsRiotum-libs.opam +++ b/opam/octez-protocol-022-PsRiotum-libs.opam @@ -17,7 +17,6 @@ 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" } @@ -32,6 +31,7 @@ depends: [ "tezos-dal-node-lib" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } + "octez-rustzcash-deps" { with-test & = version } "octez-alcotezt" { with-test & = version } ] build: [ diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam index c159b4d2073c..abf269f56ce0 100644 --- a/opam/octez-protocol-alpha-libs.opam +++ b/opam/octez-protocol-alpha-libs.opam @@ -17,7 +17,6 @@ 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-shell-libs.opam b/opam/octez-shell-libs.opam index e3f8e49b9eb5..56c4ac5a94b6 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -31,10 +31,11 @@ depends: [ "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "ppx_expect" - "octez-rustzcash-deps" { with-test & = version } + "octez-rust-deps" { with-test & = version } "ocplib-endian" "fmt" { >= "0.8.7" } "tezos-benchmark" { = version } + "octez-rustzcash-deps" { with-test & = version } "qcheck-alcotest" { with-test & >= "0.20" } "qcheck-core" {with-test} "lwt" { with-test & >= "5.7.0" & < "5.9.0" } diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam index c0b6815192f6..f38612a07475 100644 --- a/opam/octez-shell-tests.opam +++ b/opam/octez-shell-tests.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" {with-test} - "octez-rustzcash-deps" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index 40ba64964a9f..c39ef2dd0284 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-rustzcash-deps" { = version } + "octez-rust-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 e31dbc943265..cc69325eb6ac 100644 --- a/opam/octez-store-tests.opam +++ b/opam/octez-store-tests.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" {with-test} - "octez-rustzcash-deps" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index f6e17daca94e..9404b893253c 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-rustzcash-deps" { with-test & = version } + "octez-rust-deps" { with-test & = version } "bls12-381" { with-test & = version } ] build: [ diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index 5817e1ed7f80..51de6e5119d0 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-rustzcash-deps" { with-test & = version } + "octez-rust-deps" { with-test & = version } "bls12-381" { with-test & = version } "octez-protocol-alpha-libs" { with-test & = version } ] diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index bb93e7c605fc..26ffcb6ce8bc 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -19,7 +19,7 @@ depends: [ "bam-ppx" { with-test & >= "0.3" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" { with-test & = version } - "octez-rustzcash-deps" { with-test & = version } + "octez-rust-deps" { with-test & = version } "tezt-bam" { with-test & >= "0.3" } ] build: [ diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 020ff7734fbc..bef17ad46192 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" { = version } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" { with-test & = version } - "octez-rustzcash-deps" { with-test & = version } + "octez-rust-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 0c4888830f25..8b359efd913e 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 86a3415169ee..7e05844fcbe4 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 2ee76a1dcbd6..18c86779705e 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index e647c409a77b..fc3de6f2d8fd 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index b10b929b1eff..e42b138aa18e 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index 64db926a169b..84d27ce838c3 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index 380c4d94b295..a1df2bd488d6 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-018-Proxford.opam b/opam/tezos-protocol-018-Proxford.opam index 4157e2000234..4b2423d5f3e7 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-019-PtParisB.opam b/opam/tezos-protocol-019-PtParisB.opam index c3fd95dc1fcf..8e15b7156fa2 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-020-PsParisC.opam b/opam/tezos-protocol-020-PsParisC.opam index 5b95992713e5..ea78255f8598 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-021-PsQuebec.opam b/opam/tezos-protocol-021-PsQuebec.opam index 9db3e8d827da..e11b1e122e62 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-022-PsRiotum.opam b/opam/tezos-protocol-022-PsRiotum.opam index 59193745b310..3fc3af6f7842 100644 --- a/opam/tezos-protocol-022-PsRiotum.opam +++ b/opam/tezos-protocol-022-PsRiotum.opam @@ -13,7 +13,7 @@ depends: [ "octez-proto-libs" { = version } "octez-shell-libs" { = version } "octez-libs" { = version } - "octez-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 883001f9451c..e87df9ec55ac 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" {with-test} - "octez-rustzcash-deps" {with-test} + "octez-rust-deps" {with-test} "octez-libs" {with-test} "octez-protocol-alpha-libs" {with-test} "tezos-protocol-alpha" {with-test} @@ -22,7 +22,6 @@ 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 f7af4876f3ac..d334a15edd6d 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } ] build: [ diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 55762ada00e4..609817baaf59 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-rustzcash-deps" { = version } + "octez-rust-deps" { = version } "bls12-381" { = version } "octez-libs" { = version } "caqti" diff --git a/opam/tezt-etherlink.opam b/opam/tezt-etherlink.opam index 54089c7bc447..6d0f7884d02a 100644 --- a/opam/tezt-etherlink.opam +++ b/opam/tezt-etherlink.opam @@ -18,7 +18,7 @@ depends: [ "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "bls12-381" {with-test} "octez-evm-node-libs" { with-test & = version } - "octez-rustzcash-deps" {with-test} + "octez-rust-deps" {with-test} "tezos-protocol-alpha" {with-test} ] build: [ diff --git a/src/bin_agnostic_baker/dune b/src/bin_agnostic_baker/dune index 2a9f42a666f7..6f180040393d 100644 --- a/src/bin_agnostic_baker/dune +++ b/src/bin_agnostic_baker/dune @@ -7,7 +7,7 @@ (package octez-experimental-agnostic-baker) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.data-encoding octez-libs.base diff --git a/src/bin_client/dune b/src/bin_client/dune index 3e52dc6fa547..6215fc1f5828 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -7,7 +7,7 @@ (package octez-client) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 351fe1ec63a6..60711f390775 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -7,7 +7,7 @@ (package octez-codec) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.data-encoding octez-libs.base diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 9fa5adf93449..f0354dbf1e9b 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -7,7 +7,7 @@ (package octez-dal-node) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_node/dune b/src/bin_node/dune index b3eda1df53ac..b0c4b347b022 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -7,7 +7,7 @@ (package octez-node) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 60c81d99c0f5..0ed4a0b3903a 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -7,7 +7,7 @@ (package octez-snoop) (instrumentation (backend bisect_ppx)) (libraries - octez-rustzcash-deps + octez-rust-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 e6104ea46330..25f7d7c68bf4 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-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base caqti diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index 86bedd735347..949b07264b8e 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.micheline tezos-micheline-rewriting tezos-protocol-alpha.protocol diff --git a/src/lib_dal_node/test/dune b/src/lib_dal_node/test/dune index e75e9a087fa8..0984be7ac606 100644 --- a/src/lib_dal_node/test/dune +++ b/src/lib_dal_node/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.stdlib octez-libs.stdlib-unix octez-libs.base diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index af659c8ab935..057fb3bb2252 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -21,6 +21,7 @@ octez-libs.tezos-context.memory octez-libs.tezos-context-brassaia.memory octez-libs.scoru-wasm + octez-riscv-pvm octez-libs.event-logging octez-libs.octez-profiler) (preprocess (pps octez-libs.ppx_profiler)) diff --git a/src/lib_shell/dune b/src/lib_shell/dune index b1461d1fdf69..3294e9b55cde 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -33,9 +33,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries octez-rustzcash-deps bls12-381.archive)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries octez-rust-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 67cb95895981..726dd1740067 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.base octez-libs.base-test-helpers octez-shell-libs.store diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 1f47fe10d5a8..bec43c3c7796 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.base octez-libs.crypto octez-shell-libs.context-ops diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index d1aa7f877cb3..dd352e7ac931 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -19,9 +19,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 6faf0ca9f0ee..5e26781f15b9 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -19,9 +19,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 d31db32c97f7..dd3d3c1afe0a 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -22,9 +22,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 23c29b6a98f8..fb7e66e78b54 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-rustzcash-deps + octez-rust-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 7ac5c79b9f1b..0d82cfa4b0c2 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -22,9 +22,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 2289d034a4c6..33cdadc0fb5e 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-rustzcash-deps + octez-rust-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 ae73579050ef..d4282fc2c22a 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -22,9 +22,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 38d115355f8e..72152b73148f 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-rustzcash-deps + octez-rust-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 8d2b2168a6ce..f253f20f88c0 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -22,9 +22,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 eb067dd2877d..434500481f05 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-rustzcash-deps + octez-rust-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 962521bdfdb4..9e92d23a2fa6 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -22,9 +22,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 e94190b7c638..3d93c2c6b3a3 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-rustzcash-deps + octez-rust-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 5ae1fe251a59..13aac76818cc 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 2337ef981fe9..57c24fb011f3 100644 --- a/src/proto_016_PtMumbai/lib_layer2_utils/dune +++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 82dcf16996a0..345be515776f 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-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 8151f63434a5..db519f0fcd99 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 ffa6eedd6bd2..cf061b26ffd5 100644 --- a/src/proto_017_PtNairob/lib_layer2_utils/dune +++ b/src/proto_017_PtNairob/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 084f13d2bce5..469b09878148 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-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 d1c056a7b12a..ae553b8259a2 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 32658f8d5c3f..f08e94b1dd46 100644 --- a/src/proto_018_Proxford/lib_layer2_utils/dune +++ b/src/proto_018_Proxford/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 4d645024d982..bf0e47e12edd 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-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 d7ae5a34a628..8e29095ed8d5 100644 --- a/src/proto_019_PtParisB/lib_client/dune +++ b/src/proto_019_PtParisB/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 a77866892e96..54c118bb40ec 100644 --- a/src/proto_019_PtParisB/lib_layer2_utils/dune +++ b/src/proto_019_PtParisB/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 16ee09d2ecb7..e894b458068c 100644 --- a/src/proto_019_PtParisB/lib_parameters/dune +++ b/src/proto_019_PtParisB/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base tezos-protocol-019-PtParisB.parameters diff --git a/src/proto_020_PsParisC/lib_client/dune b/src/proto_020_PsParisC/lib_client/dune index 880f420f3f47..f416f1c37f98 100644 --- a/src/proto_020_PsParisC/lib_client/dune +++ b/src/proto_020_PsParisC/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_020_PsParisC/lib_layer2_utils/dune b/src/proto_020_PsParisC/lib_layer2_utils/dune index 82236e853a0b..636eecc399a9 100644 --- a/src/proto_020_PsParisC/lib_layer2_utils/dune +++ b/src/proto_020_PsParisC/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 944c599acf9c..6c76b84ef4a2 100644 --- a/src/proto_020_PsParisC/lib_parameters/dune +++ b/src/proto_020_PsParisC/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base tezos-protocol-020-PsParisC.parameters diff --git a/src/proto_021_PsQuebec/lib_client/dune b/src/proto_021_PsQuebec/lib_client/dune index 761ef6a9a5e0..f1520190573d 100644 --- a/src/proto_021_PsQuebec/lib_client/dune +++ b/src/proto_021_PsQuebec/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 e274b9397341..00a2b6a6c3c7 100644 --- a/src/proto_021_PsQuebec/lib_dal/dune +++ b/src/proto_021_PsQuebec/lib_dal/dune @@ -19,9 +19,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_021_PsQuebec/lib_delegate/test/dune b/src/proto_021_PsQuebec/lib_delegate/test/dune index 423cb73029b0..2081888734e3 100644 --- a/src/proto_021_PsQuebec/lib_delegate/test/dune +++ b/src/proto_021_PsQuebec/lib_delegate/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 e5cd7c6ae973..2a3333e2a78d 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-rustzcash-deps + octez-rust-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 3987b84f611b..3c9914061420 100644 --- a/src/proto_021_PsQuebec/lib_layer2_utils/dune +++ b/src/proto_021_PsQuebec/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 8e522ecf12f9..e2e87c3db091 100644 --- a/src/proto_021_PsQuebec/lib_parameters/dune +++ b/src/proto_021_PsQuebec/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base tezos-protocol-021-PsQuebec.parameters diff --git a/src/proto_022_PsRiotum/lib_client/dune b/src/proto_022_PsRiotum/lib_client/dune index 831aeb6a9e14..1d6243590641 100644 --- a/src/proto_022_PsRiotum/lib_client/dune +++ b/src/proto_022_PsRiotum/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_022_PsRiotum/lib_dal/dune b/src/proto_022_PsRiotum/lib_dal/dune index 2454661ee3c5..84610ee6b8d1 100644 --- a/src/proto_022_PsRiotum/lib_dal/dune +++ b/src/proto_022_PsRiotum/lib_dal/dune @@ -19,9 +19,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_022_PsRiotum/lib_delegate/test/dune b/src/proto_022_PsRiotum/lib_delegate/test/dune index 9f09a0745cb9..6c2c976fad2c 100644 --- a/src/proto_022_PsRiotum/lib_delegate/test/dune +++ b/src/proto_022_PsRiotum/lib_delegate/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.base octez-libs.test-helpers octez-libs.micheline diff --git a/src/proto_022_PsRiotum/lib_delegate/test/tenderbrute/dune b/src/proto_022_PsRiotum/lib_delegate/test/tenderbrute/dune index 1541e3dcd66b..84606259efe1 100644 --- a/src/proto_022_PsRiotum/lib_delegate/test/tenderbrute/dune +++ b/src/proto_022_PsRiotum/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base octez-shell-libs.client-base diff --git a/src/proto_022_PsRiotum/lib_layer2_utils/dune b/src/proto_022_PsRiotum/lib_layer2_utils/dune index 3c77dd6f53de..e49f2a8f6849 100644 --- a/src/proto_022_PsRiotum/lib_layer2_utils/dune +++ b/src/proto_022_PsRiotum/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-deps)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_022_PsRiotum/lib_parameters/dune b/src/proto_022_PsRiotum/lib_parameters/dune index fdd9b60d71cf..2486e122b714 100644 --- a/src/proto_022_PsRiotum/lib_parameters/dune +++ b/src/proto_022_PsRiotum/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.base tezos-protocol-022-PsRiotum.parameters diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 6ac28dfde23c..baf66b77c579 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-rustzcash-deps + octez-rust-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 b61b7334fc35..90f4d66f73f4 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-rustzcash-deps + octez-rust-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 9f9d402a8565..7857eab702d5 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-rustzcash-deps + octez-rust-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 b0f26938a558..b1d676dfe941 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-rustzcash-deps + octez-rust-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 b609baa80d62..31d6dfa4df85 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -23,9 +23,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 560a939bb6d7..a44a37e4e7cf 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.base octez-libs.micheline octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune index 93d502ab07d8..586970cd0535 100644 --- a/src/proto_alpha/lib_dal/dune +++ b/src/proto_alpha/lib_dal/dune @@ -19,9 +19,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 dd1908013bd1..39bc6923969d 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 3f959f775dae..5b6ae4e32839 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 9c47e0c6ef35..82006e70d18f 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-rustzcash-deps + octez-rust-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 62e9f10ddbf9..1cdd97f6dcfd 100644 --- a/src/proto_alpha/lib_layer2_utils/dune +++ b/src/proto_alpha/lib_layer2_utils/dune @@ -12,9 +12,8 @@ (inline_tests (flags -verbose) (modes native) - (executable - (link_flags -linkall -cclib -lblst -cclib -loctez_rustzcash_deps)) - (libraries bls12-381.archive octez-rustzcash-deps)) + (executable (link_flags -linkall -cclib -lblst -cclib -loctez_rust_deps)) + (libraries bls12-381.archive octez-rust-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 d16d636f906c..0bd6fb2f5c7c 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -26,7 +26,7 @@ (executable (name gen) (libraries - octez-rustzcash-deps + octez-rust-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 c23748a2ec5b..19e289fe2888 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 cf3e97f12b7b..a22a878f21f1 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 70dfa73cc250..519d4b06e566 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 8464b75fcc66..835f9cda0b1f 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 6d40b76f5708..d8accae74f44 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 5858e41ba5c7..b95e36178b6d 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 88717b351dd4..987ea1dc23b4 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 c8ac5b534207..11b28629a101 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-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 26138fbe152e..dfd191c1b60a 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381.archive - octez-rustzcash-deps + octez-rust-deps octez-libs.base tezt-tezos tezos-protocol-alpha.protocol diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index c1eaa41cde8b..2a8089e5601e 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive tezt tezt-tezos diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index 08ee2c054c4a..d112a3f6f93a 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive octez-libs.test-helpers octez-libs.tezt-wrapper diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index f6c64ceec4b3..ab282df705aa 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -4,7 +4,7 @@ (executable (name main) (libraries - octez-rustzcash-deps + octez-rust-deps bls12-381.archive tezt tezt-tezos -- GitLab