diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 6e133714e143bf93a6ee0a1939d8bc762b5cc7f0..118f9fb603523ea33c66fce04b844ef400063546 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -818,7 +818,7 @@ wasm-runtime-check: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: - - src/lib_wasm_runtime/lint.sh + - etherlink/lib_wasm_runtime/lint.sh after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -3196,6 +3196,71 @@ oc.unit:non-proto-x86_64: when: always retry: 2 +oc.unit:etherlink-x86_64: + image: ${ci_image_name}/build:${ci_image_tag} + stage: test + tags: + - gcp + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - Makefile + - etherlink/**/* + when: on_success + needs: + - oc.docker:ci:amd64 + - oc.build_x86_64-released + - oc.build_x86_64-exp-dev-extra + dependencies: + - oc.docker:ci:amd64 + timeout: 60 minutes + cache: + - key: cargo-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/.cargo/registry/cache + policy: pull-push + - key: sccache-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_sccache + policy: pull-push + - key: dune-build-cache-$CI_PIPELINE_ID + paths: + - $CI_PROJECT_DIR/_dune_cache + policy: pull + before_script: + - . ./scripts/version.sh + - eval $(opam env) + - . ./scripts/ci/sccache-start.sh + script: + - make $MAKE_TARGETS + - ./scripts/ci/merge_coverage.sh + after_script: + - ./scripts/ci/sccache-stop.sh + - eval $(opam env) + - dune cache trim --size=5GB + variables: + ARCH: x86_64 + MAKE_TARGETS: test-etherlink-unit + CARGO_NET_OFFLINE: "false" + SCCACHE_DIR: $CI_PROJECT_DIR/_sccache + SCCACHE_CACHE_SIZE: 5G + DUNE_CACHE: enabled + DUNE_CACHE_STORAGE_MODE: hardlink + DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache + COVERAGE_OPTIONS: --instrument-with bisect_ppx + BISECT_FILE: $CI_PROJECT_DIR/_coverage_output/ + artifacts: + name: coverage-files-$CI_JOB_ID + expire_in: 1 day + paths: + - test_results + - $BISECT_FILE/$CI_JOB_NAME_SLUG.* + reports: + junit: test_results/*.xml + when: always + retry: 2 + oc.unit:other-x86_64: image: ${ci_image_name}/build:${ci_image_tag} stage: test @@ -4351,6 +4416,7 @@ oc.unified_coverage: dependencies: - oc.docker:ci:amd64 - oc.unit:non-proto-x86_64 + - oc.unit:etherlink-x86_64 - oc.unit:other-x86_64 - oc.unit:proto-x86_64 - tezt diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index f7f36910fb8bdc098e04ed5529425c7a55ed9f85..4327154eb535772aeb40b66d3b6f9af8c80bf229 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -818,7 +818,7 @@ wasm-runtime-check: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: - - src/lib_wasm_runtime/lint.sh + - etherlink/lib_wasm_runtime/lint.sh after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -3196,6 +3196,71 @@ oc.unit:non-proto-x86_64: when: always retry: 2 +oc.unit:etherlink-x86_64: + image: ${ci_image_name}/build:${ci_image_tag} + stage: test + tags: + - gcp + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - Makefile + - etherlink/**/* + when: on_success + needs: + - oc.docker:ci:amd64 + - oc.build_x86_64-released + - oc.build_x86_64-exp-dev-extra + dependencies: + - oc.docker:ci:amd64 + timeout: 60 minutes + cache: + - key: cargo-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/.cargo/registry/cache + policy: pull-push + - key: sccache-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_sccache + policy: pull-push + - key: dune-build-cache-$CI_PIPELINE_ID + paths: + - $CI_PROJECT_DIR/_dune_cache + policy: pull + before_script: + - . ./scripts/version.sh + - eval $(opam env) + - . ./scripts/ci/sccache-start.sh + script: + - make $MAKE_TARGETS + - ./scripts/ci/merge_coverage.sh + after_script: + - ./scripts/ci/sccache-stop.sh + - eval $(opam env) + - dune cache trim --size=5GB + variables: + ARCH: x86_64 + MAKE_TARGETS: test-etherlink-unit + CARGO_NET_OFFLINE: "false" + SCCACHE_DIR: $CI_PROJECT_DIR/_sccache + SCCACHE_CACHE_SIZE: 5G + DUNE_CACHE: enabled + DUNE_CACHE_STORAGE_MODE: hardlink + DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache + COVERAGE_OPTIONS: --instrument-with bisect_ppx + BISECT_FILE: $CI_PROJECT_DIR/_coverage_output/ + artifacts: + name: coverage-files-$CI_JOB_ID + expire_in: 1 day + paths: + - test_results + - $BISECT_FILE/$CI_JOB_NAME_SLUG.* + reports: + junit: test_results/*.xml + when: always + retry: 2 + oc.unit:other-x86_64: image: ${ci_image_name}/build:${ci_image_tag} stage: test @@ -4351,6 +4416,7 @@ oc.unified_coverage: dependencies: - oc.docker:ci:amd64 - oc.unit:non-proto-x86_64 + - oc.unit:etherlink-x86_64 - oc.unit:other-x86_64 - oc.unit:proto-x86_64 - tezt diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 139e44d49741b0d948e3c337248121add0b059b6..5e12721311f16778850f522ac98e0f22e5c13758 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -545,7 +545,7 @@ wasm-runtime-check: - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: - - src/lib_wasm_runtime/lint.sh + - etherlink/lib_wasm_runtime/lint.sh after_script: - ./scripts/ci/sccache-stop.sh variables: @@ -2159,6 +2159,67 @@ oc.unit:non-proto-x86_64: when: always retry: 2 +oc.unit:etherlink-x86_64: + image: ${ci_image_name}/build:${ci_image_tag} + stage: test + tags: + - gcp + rules: + - when: on_success + needs: + - oc.docker:ci:amd64 + - oc.build_x86_64-released + - oc.build_x86_64-exp-dev-extra + dependencies: + - oc.docker:ci:amd64 + timeout: 60 minutes + cache: + - key: cargo-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/.cargo/registry/cache + policy: pull-push + - key: sccache-$CI_JOB_NAME_SLUG + paths: + - $CI_PROJECT_DIR/_sccache + policy: pull-push + - key: dune-build-cache-$CI_PIPELINE_ID + paths: + - $CI_PROJECT_DIR/_dune_cache + policy: pull + interruptible: false + before_script: + - . ./scripts/version.sh + - eval $(opam env) + - . ./scripts/ci/sccache-start.sh + script: + - make $MAKE_TARGETS + - ./scripts/ci/merge_coverage.sh + after_script: + - ./scripts/ci/sccache-stop.sh + - eval $(opam env) + - dune cache trim --size=5GB + variables: + ARCH: x86_64 + MAKE_TARGETS: test-etherlink-unit + CARGO_NET_OFFLINE: "false" + SCCACHE_DIR: $CI_PROJECT_DIR/_sccache + SCCACHE_CACHE_SIZE: 5G + DUNE_CACHE: enabled + DUNE_CACHE_STORAGE_MODE: hardlink + DUNE_CACHE_ROOT: $CI_PROJECT_DIR/_dune_cache + COVERAGE_OPTIONS: --instrument-with bisect_ppx + BISECT_FILE: $CI_PROJECT_DIR/_coverage_output/ + artifacts: + name: coverage-files-$CI_JOB_ID + expire_in: 1 day + paths: + - test_results + - $BISECT_FILE/$CI_JOB_NAME_SLUG.* + reports: + junit: test_results/*.xml + when: always + retry: 2 + oc.unit:other-x86_64: image: ${ci_image_name}/build:${ci_image_tag} stage: test diff --git a/Makefile b/Makefile index 1e2da08bc34a80d9090cb63b895eb03056f13632..e124fa85bcb50fad2aee06bac5072b904ed00c9d 100644 --- a/Makefile +++ b/Makefile @@ -294,6 +294,8 @@ test-protocol-compile: PROTO_DIRS := $(shell find src/ -maxdepth 1 -type d -path "src/proto_*" 2>/dev/null | LC_COLLATE=C sort) NONPROTO_DIRS := $(shell find src/ -maxdepth 1 -mindepth 1 -type d -not -path "src/proto_*" 2>/dev/null | LC_COLLATE=C sort) +ETHERLINK_DIRS := etherlink/bin_node/test + OTHER_DIRS := $(shell find contrib/ ci/ client-libs/ -maxdepth 1 -mindepth 1 -type d 2>/dev/null | LC_COLLATE=C sort) .PHONY: test-proto-unit @@ -322,6 +324,13 @@ test-nonproto-unit: scripts/test_wrapper.sh test-nonproto-unit \ $(addprefix @, $(addsuffix /runtest,$(NONPROTO_DIRS))) +.PHONY: test-etherlink-unit +test-etherlink-unit: + DUNE_PROFILE=$(PROFILE) \ + COVERAGE_OPTIONS="$(COVERAGE_OPTIONS)" \ + scripts/test_wrapper.sh test-etherlink-unit \ + $(addprefix @, $(addsuffix /runtest,$(ETHERLINK_DIRS))) + .PHONY: test-other-unit test-other-unit: DUNE_PROFILE=$(PROFILE) \ @@ -580,6 +589,6 @@ clean-kernels: .PHONY: wasm_runtime_gen_files wasm_runtime_gen_files:: - @cd src/lib_wasm_runtime; cargo build 2> /dev/null + @cd etherlink/lib_wasm_runtime; cargo build 2> /dev/null octez-evm-node: wasm_runtime_gen_files diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 3eebdca11a96338f3d020870ddc9573970e22619..e4d625120048f827a0d4dc51fd9fd499705e76c1 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -678,7 +678,7 @@ let jobs pipeline_type = ~source_version:true ~eval_opam:true []) - ["src/lib_wasm_runtime/lint.sh"] + ["etherlink/lib_wasm_runtime/lint.sh"] |> enable_cargo_cache |> enable_sccache in let job_ocaml_check : tezos_job = @@ -953,7 +953,8 @@ let jobs pipeline_type = make_rules ~changes:changeset_octez ~dependent:true () in let job_unit_test ~__POS__ ?(image = Images.CI.build) ?timeout - ?parallel_vector ~arch ~name ~make_targets () : tezos_job = + ?parallel_vector ?(rules = rules) ~arch ~name ~make_targets () : + tezos_job = let arch_string = arch_to_string arch in let script = ["make $MAKE_TARGETS"] in let dependencies = build_dependencies arch in @@ -1015,6 +1016,16 @@ let jobs pipeline_type = () |> enable_coverage_instrumentation |> enable_coverage_output_artifact in + let oc_unit_etherlink_x86_64 = + job_unit_test + ~__POS__ + ~name:"oc.unit:etherlink-x86_64" + ~arch:Amd64 + ~rules:(make_rules ~changes:changeset_etherlink ~dependent:true ()) + ~make_targets:["test-etherlink-unit"] + () + |> enable_coverage_instrumentation |> enable_coverage_output_artifact + in let oc_unit_other_x86_64 = (* Runs unit tests for contrib. *) job_unit_test @@ -1116,6 +1127,7 @@ let jobs pipeline_type = in [ oc_unit_non_proto_x86_64; + oc_unit_etherlink_x86_64; oc_unit_other_x86_64; oc_unit_proto_x86_64; oc_unit_non_proto_arm64; diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 388b399c992cb4ba0f5423e3312259560bbd1ad4..2d43a639dbc41a30bc339fc24b1417a68e5a6788 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -437,6 +437,10 @@ let changeset_octez = "tzt_reference_test_suite/**/*"; ]) +(* Only if Etherlink has changed *) +let changeset_etherlink = + Changeset.(changeset_base @ make ["etherlink/**/*"; "Makefile"]) + (** Only if octez source code has changed, if the images has changed or if kernels.mk changed. *) let changeset_octez_or_kernels = diff --git a/etherlink/bin_node/dune b/etherlink/bin_node/dune index 1175411d5448625d10f5578157c342c33df0da06..a3d39f23bd70c114f07e67e1130851ffb47b45fe 100644 --- a/etherlink/bin_node/dune +++ b/etherlink/bin_node/dune @@ -7,7 +7,7 @@ (package octez-evm-node) (instrumentation (backend bisect_ppx)) (libraries - octez-rust-deps + octez-evm-node-libs.evm_node_rust_deps bls12-381.archive octez-libs.base octez-libs.base.unix diff --git a/etherlink/bin_node/index.mld b/etherlink/bin_node/index.mld index 7cfd6ef2aa26710ffb1e87d9e449a1bc84157652..e8ffdf4f7cf4c3c10f1768d4c0b39f213aebd6f0 100644 --- a/etherlink/bin_node/index.mld +++ b/etherlink/bin_node/index.mld @@ -9,5 +9,6 @@ It contains the following libraries: - {{!module-Evm_node_lib_dev}Evm_node_lib_dev}: An implementation of a subset of Ethereum JSON-RPC API for the EVM rollup [dev version] - {{!module-Evm_node_lib_dev_encoding}Evm_node_lib_dev_encoding}: EVM encodings for the EVM node and plugin for the WASM Debugger [dev version] - {{!module-Evm_node_migrations}Evm_node_migrations}: SQL migrations for the EVM node store +- {{!module-Evm_node_rust_deps}Evm_node_rust_deps}: WASM runtime foreign archive - {{!module-Evm_node_wasm_runtime}Evm_node_wasm_runtime}: WASM runtime compatible with the WASM PVM - {{!module-Wasm_runtime_callbacks}Wasm_runtime_callbacks}: Callbacks implementing the I/O functions required to implement the host functions of the WASM runtime diff --git a/etherlink/bin_node/test/dune b/etherlink/bin_node/test/dune index 1c53324ae75c170866880d4636e832dcc641e842..d6355c10dcfab90b0fe444c95e1739cc44f07f8e 100644 --- a/etherlink/bin_node/test/dune +++ b/etherlink/bin_node/test/dune @@ -1,13 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(library - (name etherlink_bin_node_test_tezt_lib) - (instrumentation (backend bisect_ppx)) +(executables + (names test_rlp test_ethbloom test_call_tracer_algo test_wasm_runtime) (libraries - tezt.core - octez-rust-deps bls12-381.archive + octez-evm-node-libs.evm_node_rust_deps octez-libs.base octez-libs.base.unix octez-libs.base-test-helpers @@ -15,43 +13,63 @@ qcheck-alcotest octez-alcotezt octez-evm-node-libs.evm_node_lib_dev + tezt octez-libs.tezt-wrapper tezt-tezos + tezt_etherlink octez-l2-libs.irmin_context tezos-protocol-alpha.protocol) - (library_flags (:standard -linkall)) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) - -open Tezt_core - -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_base_test_helpers -open Tezos_test_helpers -open Octez_alcotezt + -open Tezt + -open Tezt.Base -open Tezt_wrapper -open Tezt_wrapper.Base -open Tezt_tezos -open Tezt_tezos.Runnable.Syntax - -open Tezos_layer2_irmin_context) - (modules test_rlp test_ethbloom test_call_tracer_algo test_wasm_runtime)) + -open Tezt_etherlink + -open Tezos_layer2_irmin_context)) -(executable - (name main) - (instrumentation (backend bisect_ppx --bisect-sigterm)) - (libraries - etherlink_bin_node_test_tezt_lib - tezt) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) - (modules main)) +(rule + (alias runtest) + (package octez-evm-node-tests) + (deps + rlptest.json + invalidRLPTest.json + ../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm) + (action (run %{dep:./test_rlp.exe}))) (rule (alias runtest) (package octez-evm-node-tests) - (enabled_if (<> false %{env:RUNTEZTALIAS=true})) - (action (run %{dep:./main.exe} /flaky /ci_disabled))) + (deps + rlptest.json + invalidRLPTest.json + ../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm) + (action (run %{dep:./test_ethbloom.exe}))) (rule - (targets main.ml) - (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) + (alias runtest) + (package octez-evm-node-tests) + (deps + rlptest.json + invalidRLPTest.json + ../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm) + (action (run %{dep:./test_call_tracer_algo.exe}))) + +(rule + (alias runtest) + (package octez-evm-node-tests) + (deps + rlptest.json + invalidRLPTest.json + ../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm) + (action (run %{dep:./test_wasm_runtime.exe}))) diff --git a/etherlink/bin_node/test/test_call_tracer_algo.ml b/etherlink/bin_node/test/test_call_tracer_algo.ml index 5dceb0c85ee541f66c9df782a9bf657fb8b3bf93..c60658b5d01a7e999024a12bc839d57887c3dd17 100644 --- a/etherlink/bin_node/test/test_call_tracer_algo.ml +++ b/etherlink/bin_node/test/test_call_tracer_algo.ml @@ -9,7 +9,7 @@ (** Testing ------- Component: bin_node - Invocation: dune exec etherlink/bin_node/test/main.exe -- --file test_call_tracer_algo.ml + Invocation: cd etherlink/bin_node/test; dune exec ./test_call_tracer_algo.exe Subject: Tests for implementation of call tracer algorithm *) @@ -285,7 +285,7 @@ let test_decoding_rlp = (CallTracer.to_string call)) ; Lwt.return_unit) -let test_decoding_rlp_min = +let _test_decoding_rlp_min = register_unit_test ~title:"CallTracer: Test decoding call with few values" ~tags:["call_tracer"; "debug"; "encoding"; "rlp"] @@ -451,3 +451,5 @@ let () = test_decoding_rlp protocols ; test_decoding_rlp_revert_reason protocols ; () + +let () = Test.run () diff --git a/etherlink/bin_node/test/test_ethbloom.ml b/etherlink/bin_node/test/test_ethbloom.ml index 16d73f8f7b5cd1613c606fcc36fba07723d13f46..f6e2b97c91de25bd0a13de0a222d5a021dfb95d2 100644 --- a/etherlink/bin_node/test/test_ethbloom.ml +++ b/etherlink/bin_node/test/test_ethbloom.ml @@ -8,7 +8,7 @@ (** Testing ------- Component: Bin_evm_node - Invocation: dune exec etherlink/bin_evm_node/test/main.exe -- --file test_ethbloom.ml + Invocation: cd etherlink/bin_evm_node/test/; dune exec ./test_ethbloom.exe Subject: Tests for implementation of Ethereum bloom filters *) @@ -180,3 +180,5 @@ let tests = ] let () = Alcotest.run ~__FILE__ "Test Ethbloom" tests + +let () = Test.run () diff --git a/etherlink/bin_node/test/test_rlp.ml b/etherlink/bin_node/test/test_rlp.ml index 5ad94a261c580d8d31e3c0adeb7e644f5bb8ebb2..eee7741283d01109ad35cbb7337fc6f5b2375bab 100644 --- a/etherlink/bin_node/test/test_rlp.ml +++ b/etherlink/bin_node/test/test_rlp.ml @@ -27,7 +27,7 @@ (** Testing ------- Component: Bin_evm_node - Invocation: dune exec etherlink/bin_node/test/main.exe -- --file test_rlp.ml + Invocation: cd etherlink/bin_node/test/ ; dune exec ./test_rlp.exe Subject: Tests for the RLP encoder/decoder *) @@ -61,7 +61,7 @@ let decode_out_in_vector out = | None -> Test.fail "Illformed JSON test vector" let read_test_vector filename = - let file = read_file Filename.(concat (dirname __FILE__) filename) in + let file = read_file filename in let json = Data_encoding.Json.from_string file in let read_test = function | testname, `O [("in", rlp); ("out", `String bytes)] -> @@ -154,3 +154,5 @@ let tests = ] let () = Alcotest.run ~__FILE__ "Test RLP encoding" tests + +let () = Test.run () diff --git a/etherlink/bin_node/test/test_wasm_runtime.ml b/etherlink/bin_node/test/test_wasm_runtime.ml index 41b2fa9a40bce6a775f5a987d1e17e984f00180b..eba8d7673e577144eae4cf37256c7ebc6935666e 100644 --- a/etherlink/bin_node/test/test_wasm_runtime.ml +++ b/etherlink/bin_node/test/test_wasm_runtime.ml @@ -8,7 +8,7 @@ (* Testing ------- Component: EVM Node’s WASM Runtime - Invocation: dune exec -- etherlink/bin_node/test/main.exe wasm_runtime + Invocation: cd etherlink/bin_node/test/ ; dune exec -- ./test_wasm_runtime.exe *) open Evm_node_lib_dev @@ -21,22 +21,19 @@ let register ?(tags = []) = ~__FILE__ ~tags:("wasm_runtime" :: tags) -let context_hash_typ = Check.(convert Context_hash.to_b58check string) - let z_typ = Check.(convert Z.to_int64 int64) -let empty_tree = Irmin_context.PVMState.empty () - let expect_ok msg = function Ok x -> x | Error _err -> Test.fail msg let test_wasm_runtime_id () = register ~title:"test wasm_runtime_run" @@ fun () -> + Log.info "Initialize the tree" ; let* tree = Evm_state.init - ~kernel: - "etherlink/kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm" + ~kernel:"../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm" in let tree = expect_ok "Should be able to create an initial state" tree in + Log.info "Run kernel_run" ; let* tree = Wasm_runtime.run ~preimages_dir:Temp.(dir "wasm_2_0_0") @@ -45,6 +42,7 @@ let test_wasm_runtime_id () = Tezos_crypto.Hashed.Smart_rollup_address.zero [] in + Log.info "Check state consistency" ; let* quantity = Durable_storage.current_block_number (fun key -> let* candidate = Evm_state.inspect tree key in @@ -58,3 +56,5 @@ let test_wasm_runtime_id () = unit let () = test_wasm_runtime_id () + +let () = Test.run () diff --git a/etherlink/lib_wasm_runtime/.cargo/config.toml b/etherlink/lib_wasm_runtime/.cargo/config.toml new file mode 100644 index 0000000000000000000000000000000000000000..f52e93b2275c7ad9dc32cc0df6e3b72e470d2b14 --- /dev/null +++ b/etherlink/lib_wasm_runtime/.cargo/config.toml @@ -0,0 +1,5 @@ +[build] +rustflags = ["-Awarnings"] + +[target.'cfg(target_os = "macos")'] +rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] diff --git a/src/lib_wasm_runtime/.gitignore b/etherlink/lib_wasm_runtime/.gitignore similarity index 100% rename from src/lib_wasm_runtime/.gitignore rename to etherlink/lib_wasm_runtime/.gitignore diff --git a/src/lib_wasm_runtime/Cargo.lock b/etherlink/lib_wasm_runtime/Cargo.lock similarity index 50% rename from src/lib_wasm_runtime/Cargo.lock rename to etherlink/lib_wasm_runtime/Cargo.lock index e19d01cb21f61e862b6e43df7acf5f4c5d2f78fc..c016c1d12f08f802515768115b0d29e5e457dfb2 100644 --- a/src/lib_wasm_runtime/Cargo.lock +++ b/etherlink/lib_wasm_runtime/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.0", + "gimli 0.31.1", ] [[package]] @@ -17,6 +17,27 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +[[package]] +name = "aead" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "opaque-debug", +] + [[package]] name = "ahash" version = "0.7.8" @@ -28,6 +49,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -39,9 +69,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -54,43 +84,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arrayref" @@ -98,17 +128,32 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "atomic-shim" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -131,6 +176,53 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64ct" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" + +[[package]] +name = "bech32" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" + +[[package]] +name = "bellman" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4dd656ef4fdf7debb6d87d4dd92642fcbcdb78cbf6600c13e25c87e4d1a3807" +dependencies = [ + "bitvec", + "blake2s_simd", + "byteorder", + "crossbeam-channel", + "ff 0.12.1", + "group 0.12.1", + "lazy_static", + "log", + "num_cpus", + "pairing", + "rand_core 0.6.4", + "rayon", + "subtle", +] + +[[package]] +name = "bip0039" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0830ae4cc96b0617cc912970c2b17e89456fecbf55e8eed53a956f37ab50c41" +dependencies = [ + "hmac", + "pbkdf2", + "rand 0.8.5", + "sha2 0.9.9", + "unicode-normalization", + "zeroize", +] + [[package]] name = "bit-vec" version = "0.6.3" @@ -161,6 +253,39 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + +[[package]] +name = "blake2b_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +dependencies = [ + "arrayref", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", +] + +[[package]] +name = "blake2s_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +dependencies = [ + "arrayref", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -179,6 +304,44 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-modes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" +dependencies = [ + "block-padding", + "cipher", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "bls12_381" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" +dependencies = [ + "ff 0.12.1", + "group 0.12.1", + "pairing", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +dependencies = [ + "sha2 0.9.9", +] + [[package]] name = "bs58" version = "0.5.1" @@ -194,6 +357,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + [[package]] name = "bytecheck" version = "0.6.12" @@ -224,15 +393,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cc" -version = "1.1.21" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -243,11 +412,70 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chacha20" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clearscreen" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e55dadbdd203f69c0a107bc78fca6e47d605345610ee77dcf24203fdf510b317" +dependencies = [ + "nix", + "terminfo", + "thiserror", + "which", + "winapi", +] + [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "corosensei" @@ -264,9 +492,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -286,7 +514,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec", + "arrayvec 0.7.6", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -325,7 +553,7 @@ dependencies = [ "cranelift-entity", "fxhash", "hashbrown 0.12.3", - "indexmap", + "indexmap 1.9.3", "log", "smallvec", ] @@ -354,6 +582,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -429,6 +666,19 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -452,7 +702,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -475,7 +725,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -486,7 +736,17 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.89", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", ] [[package]] @@ -499,7 +759,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.10", ] [[package]] @@ -508,6 +768,15 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivative" version = "2.2.0" @@ -538,6 +807,46 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "directories" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ecdsa" version = "0.12.4" @@ -565,12 +874,27 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 4.1.3", "ed25519", "sha2 0.10.8", "subtle", ] +[[package]] +name = "ed25519-zebra" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +dependencies = [ + "curve25519-dalek 3.2.0", + "hashbrown 0.12.3", + "hex", + "rand_core 0.6.4", + "serde", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "either" version = "1.13.0" @@ -584,14 +908,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83e5c176479da93a0983f0a6fdc3c1b8e7d5be0d7fe3fe05a99f15b96582b9a8" dependencies = [ "crypto-bigint", - "ff", + "ff 0.10.1", "generic-array", - "group", + "group 0.10.0", "rand_core 0.6.4", "subtle", "zeroize", ] +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + [[package]] name = "enum-iterator" version = "0.7.0" @@ -630,7 +960,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -656,6 +986,41 @@ dependencies = [ "log", ] +[[package]] +name = "equihash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4127688f6177e3f57521881cb1cfd90d1228214f9dc43b8efe6f6c6948cd8280" +dependencies = [ + "blake2b_simd 0.5.11", + "byteorder", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "f4jumble" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75" +dependencies = [ + "blake2b_simd 1.0.2", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -672,12 +1037,35 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "bitvec", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[package]] +name = "fixed-hash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rand 0.8.5", + "rustc-hex", + "static_assertions", +] + [[package]] name = "fnv" version = "1.0.7" @@ -693,12 +1081,59 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fpe" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd910db5f9ca4dc3116f8c46367825807aa2b942f72565f16b4be0b208a00a9e" +dependencies = [ + "block-modes", + "cipher", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", +] + [[package]] name = "fxhash" version = "0.2.1" @@ -726,7 +1161,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -736,15 +1171,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "group" @@ -752,11 +1187,83 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" dependencies = [ - "ff", + "ff 0.10.1", "rand_core 0.6.4", "subtle", ] +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "gumdrop" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc700f989d2f6f0248546222d9b4258f5b02a171a431f8285a81c08142629e3" +dependencies = [ + "gumdrop_derive", +] + +[[package]] +name = "gumdrop_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "halo2_gadgets" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f3914f58cc4af5e4fe83d48b02d582be18976bc7e96c3151aa2bf1c98e9f60" +dependencies = [ + "arrayvec 0.7.6", + "bitvec", + "ff 0.12.1", + "group 0.12.1", + "halo2_proofs", + "lazy_static", + "pasta_curves", + "rand 0.8.5", + "subtle", + "uint", +] + +[[package]] +name = "halo2_proofs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760" +dependencies = [ + "blake2b_simd 1.0.2", + "ff 0.12.1", + "group 0.12.1", + "pasta_curves", + "rand_core 0.6.4", + "rayon", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -772,6 +1279,24 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "hdwallet" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd89bf343be18dbe1e505100e48168bbd084760e842a8fed0317d2361470193" +dependencies = [ + "lazy_static", + "rand_core 0.6.4", + "ring", + "secp256k1", +] + [[package]] name = "heck" version = "0.3.3" @@ -781,6 +1306,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "hex" version = "0.4.3" @@ -797,12 +1328,196 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -811,12 +1526,52 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "incrementalmerkletree" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5ad43a3f5795945459d577f6589cf62a476e92c79b75e70cd954364e14ce17b" +dependencies = [ + "serde", ] [[package]] @@ -829,21 +1584,66 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + [[package]] name = "is_terminal_polyfill" version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +[[package]] +name = "itoa" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" + [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "jubjub" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" +dependencies = [ + "bitvec", + "bls12_381", + "ff 0.12.1", + "group 0.12.1", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -858,9 +1658,69 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" + +[[package]] +name = "libm" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "librustzcash" +version = "0.2.0" +dependencies = [ + "anyhow", + "backtrace", + "bellman", + "blake2b_simd 1.0.2", + "blake2s_simd", + "bls12_381", + "byteorder", + "clearscreen", + "ed25519-zebra", + "group 0.12.1", + "gumdrop", + "incrementalmerkletree", + "ipnet", + "jubjub", + "libc", + "memuse", + "metrics", + "metrics-exporter-prometheus", + "nonempty", + "orchard", + "rand 0.8.5", + "rand_core 0.6.4", + "secp256k1", + "secrecy", + "subtle", + "thiserror", + "time", + "tracing", + "tracing-appender", + "tracing-core", + "tracing-subscriber", + "zcash_address", + "zcash_encoding", + "zcash_history", + "zcash_note_encryption", + "zcash_primitives", + "zcash_proofs", + "zeroize", +] [[package]] name = "libsecp256k1" @@ -907,6 +1767,18 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -941,6 +1813,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "memchr" version = "2.7.4" @@ -965,6 +1846,77 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memuse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2145869435ace5ea6ea3d35f59be559317ec9a0d04e1812d5f185a87b6d36f1a" +dependencies = [ + "nonempty", +] + +[[package]] +name = "metrics" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827" +dependencies = [ + "ahash", + "metrics-macros", +] + +[[package]] +name = "metrics-exporter-prometheus" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343a5ceb38235928e7a5687412590f07e6d281522dcd9ff51246f8856eef5fe5" +dependencies = [ + "hyper", + "ipnet", + "metrics", + "metrics-util", + "parking_lot", + "quanta", + "thiserror", + "tokio", +] + +[[package]] +name = "metrics-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0daa0ab3a0ae956d0e2c1f42511422850e577d36a255357d1a7d08d45ee3a2f1" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "metrics-util" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1174223789e331d9d47a4a953dac36e397db60fa8d2a111ac505388c6c7fe32e" +dependencies = [ + "ahash", + "aho-corasick 0.7.20", + "atomic-shim", + "crossbeam-epoch", + "crossbeam-utils", + "dashmap 4.0.2", + "hashbrown 0.11.2", + "indexmap 1.9.3", + "metrics", + "num_cpus", + "ordered-float", + "parking_lot", + "quanta", + "radix_trie", + "sketches-ddsketch", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -980,12 +1932,54 @@ dependencies = [ "adler2", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "more-asserts" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "5.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +dependencies = [ + "memchr", + "version_check", +] + [[package]] name = "nom" version = "7.1.3" @@ -996,6 +1990,22 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1007,6 +2017,12 @@ dependencies = [ "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.46" @@ -1025,11 +2041,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -1062,7 +2088,7 @@ checksum = "1d51b05aa0083eaec54b22a3f2a3d49175e04b4fb77ca7abb5a85731736239c3" dependencies = [ "cc", "proc-macro2", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -1073,7 +2099,7 @@ checksum = "3de4a0decff0fd3ee0928dfa15dac08651157f8f814e93b34fdf962190354035" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -1082,45 +2108,148 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff95caad36996cfaa425f1469bf0c132afac668e2654d5d1d89d1cc64001be02" dependencies = [ - "cc", - "cty", + "cc", + "cty", +] + +[[package]] +name = "octez-evm-node-wasm-runtime" +version = "0.0.0-dev" +dependencies = [ + "env_logger", + "hex", + "librustzcash", + "log", + "ocaml", + "ocaml-build", + "tezos_crypto_rs", + "wasmer", + "wasmer-compiler-cranelift", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "orchard" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f918076e191a68d55c5517a16e075ecfe58fc63ed112408263f3d6194597bfcf" +dependencies = [ + "aes", + "bitvec", + "blake2b_simd 1.0.2", + "ff 0.12.1", + "fpe", + "group 0.12.1", + "halo2_gadgets", + "halo2_proofs", + "hex", + "incrementalmerkletree", + "lazy_static", + "memuse", + "nonempty", + "pasta_curves", + "rand 0.8.5", + "reddsa", + "serde", + "subtle", + "zcash_note_encryption", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.9.9", +] + +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" +dependencies = [ + "group 0.12.1", ] [[package]] -name = "octez-evm-node-wasm-runtime" -version = "0.0.0-dev" +name = "parity-scale-codec" +version = "3.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "env_logger", - "hex", - "log", - "ocaml", - "ocaml-build", - "tezos_crypto_rs", - "wasmer", - "wasmer-compiler-cranelift", + "arrayvec 0.7.6", + "bitvec", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "serde", ] [[package]] -name = "once_cell" -version = "1.19.0" +name = "parity-scale-codec-derive" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.89", +] [[package]] -name = "opaque-debug" -version = "0.3.1" +name = "parking_lot" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] [[package]] -name = "p256" -version = "0.9.0" +name = "parking_lot_core" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2 0.9.9", + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -1131,7 +2260,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.7", "smallvec", "windows-targets", ] @@ -1161,17 +2290,114 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "password-hash" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "pasta_curves" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8" +dependencies = [ + "blake2b_simd 1.0.2", + "ff 0.12.1", + "group 0.12.1", + "lazy_static", + "rand 0.8.5", + "static_assertions", + "subtle", +] + +[[package]] +name = "pbkdf2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" +dependencies = [ + "crypto-mac", + "password-hash", +] + [[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "poly1305" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -1182,6 +2408,26 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "primitive-types" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +dependencies = [ + "fixed-hash", + "impl-codec", + "uint", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1208,9 +2454,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1235,6 +2481,22 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "quanta" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.2+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quote" version = "1.0.37" @@ -1250,13 +2512,23 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + [[package]] name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "rand_chacha", + "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", ] @@ -1267,6 +2539,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] @@ -1280,6 +2554,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -1291,6 +2575,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rand_hc" @@ -1301,6 +2588,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "rayon" version = "1.10.0" @@ -1321,15 +2617,52 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "reddsa" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cc8038c8b7e481bdf688d0585d4897ed0e9e0cee10aa365dde51238c20e4182" +dependencies = [ + "blake2b_simd 1.0.2", + "byteorder", + "group 0.12.1", + "jubjub", + "pasta_curves", + "rand_core 0.6.4", + "serde", + "thiserror", + "zeroize", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + [[package]] name = "regalloc2" version = "0.5.1" @@ -1344,23 +2677,32 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "aho-corasick", + "aho-corasick 1.1.3", "memchr", - "regex-automata", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ - "aho-corasick", + "aho-corasick 1.1.3", "memchr", "regex-syntax 0.8.5", ] @@ -1398,6 +2740,30 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "rkyv" version = "0.7.45" @@ -1408,7 +2774,7 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.12.3", - "indexmap", + "indexmap 1.9.3", "ptr_meta", "rend", "rkyv_derive", @@ -1434,6 +2800,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + [[package]] name = "rustc_version" version = "0.4.1" @@ -1443,6 +2815,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1455,6 +2840,33 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "zeroize", +] + [[package]] name = "semver" version = "1.0.23" @@ -1463,9 +2875,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -1483,13 +2895,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -1516,6 +2928,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -1544,6 +2965,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sketches-ddsketch" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" + [[package]] name = "slice-group-by" version = "0.3.1" @@ -1556,12 +2989,34 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strum" version = "0.20.0" @@ -1599,13 +3054,24 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "unicode-ident", + "syn 2.0.89", ] [[package]] @@ -1620,6 +3086,19 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "terminfo" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +dependencies = [ + "dirs", + "fnv", + "nom 5.1.3", + "phf", + "phf_codegen", +] + [[package]] name = "tezos_crypto_rs" version = "0.6.0" @@ -1627,13 +3106,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8954f27b00228b1fc669cddfa0e604a40adc5ee443002d3d31abdea0b911fcb6" dependencies = [ "anyhow", - "bs58", + "bs58 0.5.1", "byteorder", "cryptoxide", "ed25519-dalek", "hex", "libsecp256k1", - "nom", + "nom 7.1.3", "num-bigint", "num-traits", "p256", @@ -1656,7 +3135,7 @@ dependencies = [ "bitvec", "hex", "lazy_static", - "nom", + "nom 7.1.3", "num-bigint", "num-traits", "serde", @@ -1680,22 +3159,73 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", ] [[package]] @@ -1713,6 +3243,55 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +dependencies = [ + "backtrace", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.6.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + [[package]] name = "tracing" version = "0.1.40" @@ -1724,6 +3303,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + [[package]] name = "tracing-attributes" version = "0.1.27" @@ -1732,7 +3323,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", ] [[package]] @@ -1742,8 +3333,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "time", + "tracing", + "tracing-core", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "typenum" version = "1.17.0" @@ -1751,16 +3366,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "unicode-bidi" -version = "0.3.15" +name = "uint" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -1777,17 +3398,45 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1796,9 +3445,15 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" + +[[package]] +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" @@ -1806,6 +3461,21 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1814,9 +3484,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -1825,16 +3495,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -1863,9 +3533,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1873,22 +3543,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasmer" @@ -1897,7 +3567,7 @@ dependencies = [ "bytes", "cfg-if", "derivative", - "indexmap", + "indexmap 1.9.3", "js-sys", "more-asserts", "rustc-demangle", @@ -1970,7 +3640,7 @@ dependencies = [ "bytecheck", "enum-iterator", "enumset", - "indexmap", + "indexmap 1.9.3", "more-asserts", "rkyv", "target-lexicon", @@ -1985,11 +3655,11 @@ dependencies = [ "cc", "cfg-if", "corosensei", - "dashmap", + "dashmap 5.5.3", "derivative", "enum-iterator", "fnv", - "indexmap", + "indexmap 1.9.3", "lazy_static", "libc", "mach", @@ -2008,10 +3678,32 @@ version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" dependencies = [ - "indexmap", + "indexmap 1.9.3", "url", ] +[[package]] +name = "web-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2056,6 +3748,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -2150,6 +3851,27 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -2159,6 +3881,131 @@ dependencies = [ "tap", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + +[[package]] +name = "zcash_address" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1322a31b757f0087f110cc4a85dc5c6ccf83d0533bac04c4d3d1ce9112cc602" +dependencies = [ + "bech32", + "bs58 0.4.0", + "f4jumble", + "zcash_encoding", +] + +[[package]] +name = "zcash_encoding" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb61ea88eb539bc0ac2068e5da99411dd4978595b3d7ff6a4b1562ddc8e8710" +dependencies = [ + "byteorder", + "nonempty", +] + +[[package]] +name = "zcash_history" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb611a28a4e13ac715ee712f4344d6b279b767daf6345dafefb2c4bf582b6679" +dependencies = [ + "blake2b_simd 1.0.2", + "byteorder", + "primitive-types", +] + +[[package]] +name = "zcash_note_encryption" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f84ae538f05a8ac74c82527f06b77045ed9553a0871d9db036166a4c344e3a" +dependencies = [ + "chacha20", + "chacha20poly1305", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "zcash_primitives" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb1ef5719fb24b42450dcd6b10e6155793be5668f0d962ad8132b6e4d108635" +dependencies = [ + "aes", + "bip0039", + "bitvec", + "blake2b_simd 1.0.2", + "blake2s_simd", + "bls12_381", + "bs58 0.4.0", + "byteorder", + "chacha20poly1305", + "equihash", + "ff 0.12.1", + "fpe", + "group 0.12.1", + "hdwallet", + "hex", + "incrementalmerkletree", + "jubjub", + "lazy_static", + "memuse", + "nonempty", + "orchard", + "rand 0.8.5", + "rand_core 0.6.4", + "ripemd", + "secp256k1", + "sha2 0.9.9", + "subtle", + "zcash_encoding", + "zcash_note_encryption", +] + +[[package]] +name = "zcash_proofs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e67054525b4897a97386ce562240f08ac9bcad07183130fe8d797224d712112d" +dependencies = [ + "bellman", + "blake2b_simd 1.0.2", + "bls12_381", + "byteorder", + "directories", + "ff 0.12.1", + "group 0.12.1", + "jubjub", + "lazy_static", + "rand_core 0.6.4", + "zcash_primitives", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -2177,7 +4024,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -2185,3 +4053,39 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] diff --git a/src/lib_wasm_runtime/Cargo.toml b/etherlink/lib_wasm_runtime/Cargo.toml similarity index 84% rename from src/lib_wasm_runtime/Cargo.toml rename to etherlink/lib_wasm_runtime/Cargo.toml index 725c30c63196476e8f7c7cf9dd65beb9d79791b8..a0b14f7b9d8b68831a40855a7c73a3936dd4806e 100644 --- a/src/lib_wasm_runtime/Cargo.toml +++ b/etherlink/lib_wasm_runtime/Cargo.toml @@ -4,6 +4,9 @@ version = "0.0.0-dev" authors = [ "Etherlink Core Engineers " ] edition = "2021" +[lib] +crate-type = ["staticlib", "cdylib", "rlib"] + [build-dependencies] ocaml-build = { version = "1.*", features = ["dune"] } @@ -15,3 +18,4 @@ wasmer-compiler-cranelift = { path = "../../src/rust_deps/wasmer-3.3.0/lib/compi tezos_crypto_rs = { version = "0.6", default-features = false } log = "0.4" env_logger = "0.11" +librustzcash = { path = "../../src/rustzcash_deps" } diff --git a/src/lib_wasm_runtime/README.md b/etherlink/lib_wasm_runtime/README.md similarity index 100% rename from src/lib_wasm_runtime/README.md rename to etherlink/lib_wasm_runtime/README.md diff --git a/src/lib_wasm_runtime/architecture.png b/etherlink/lib_wasm_runtime/architecture.png similarity index 100% rename from src/lib_wasm_runtime/architecture.png rename to etherlink/lib_wasm_runtime/architecture.png diff --git a/src/lib_wasm_runtime/build.rs b/etherlink/lib_wasm_runtime/build.rs similarity index 100% rename from src/lib_wasm_runtime/build.rs rename to etherlink/lib_wasm_runtime/build.rs diff --git a/etherlink/lib_wasm_runtime/build.sh b/etherlink/lib_wasm_runtime/build.sh new file mode 100755 index 0000000000000000000000000000000000000000..f813b89da1c3679e01e60f0a8d8552e120e9f466 --- /dev/null +++ b/etherlink/lib_wasm_runtime/build.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2024 TriliTech +# +# SPDX-License-Identifier: MIT + +# This is a build script to be used in the Dune rule to make writing the rule less difficult. + +# Ensure that failures bubble up. +set -e + +OUT_DIR=$(dirname "$0") +CARGO_TARGET_DIR="${OCTEZ_RUST_DEPS_TARGET_DIR:-$OUT_DIR/target}" + +# Make sure the subsequent processes have access to these. +export OCTEZ_RUST_DEPS_NO_WASMER_HEADERS=1 +export CARGO_TARGET_DIR + +# Build the Rust project. +cargo build --release --locked --target-dir="$CARGO_TARGET_DIR" + +# Copy the built artifacts to the output directory. +cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.a" "$OUT_DIR/liboctez_evm_node_rust_deps.a" + +if [[ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.so" ]]; then + cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.so" "$OUT_DIR/dlloctez_evm_node_rust_deps.so" +fi + +if [[ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.dylib" ]]; then + cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.dylib" "$OUT_DIR/dlloctez_evm_node_rust_deps.so" +fi diff --git a/etherlink/lib_wasm_runtime/dune b/etherlink/lib_wasm_runtime/dune new file mode 100644 index 0000000000000000000000000000000000000000..0a917d168a0d691e0ac6efd7e7259d446eff9490 --- /dev/null +++ b/etherlink/lib_wasm_runtime/dune @@ -0,0 +1,23 @@ +; This file was automatically generated, do not edit. +; Edit file manifest/main.ml instead. + +(library + (name evm_node_rust_deps) + (public_name octez-evm-node-libs.evm_node_rust_deps) + (instrumentation (backend bisect_ppx)) + (foreign_archives octez_evm_node_rust_deps)) + +(dirs :standard .cargo (not target)) + +(rule + (targets liboctez_evm_node_rust_deps.a dlloctez_evm_node_rust_deps.so) + (deps + (file build.sh) + (file Cargo.toml) + (file Cargo.lock) + (file ../../rust-toolchain) + (source_tree .cargo) + (source_tree ../../src/rustzcash_deps) + (source_tree ../../src/rust_deps/wasmer-3.3.0) + (source_tree src)) + (action (no-infer (bash ./build.sh)))) diff --git a/src/lib_wasm_runtime/lint.sh b/etherlink/lib_wasm_runtime/lint.sh similarity index 94% rename from src/lib_wasm_runtime/lint.sh rename to etherlink/lib_wasm_runtime/lint.sh index 062c9610344263d801c176bef6d7453d42504257..d2f1120ba35feb12015ac1d8c2231ab696cd4e17 100755 --- a/src/lib_wasm_runtime/lint.sh +++ b/etherlink/lib_wasm_runtime/lint.sh @@ -5,7 +5,7 @@ START_DIR="$(pwd)" TOPLEVEL="$(git rev-parse --show-toplevel)" FILES=("wasm_runtime_gen.ml" "wasm_runtime_gen.mli") -cd "$TOPLEVEL/src/lib_wasm_runtime" || exit 3 +cd "$TOPLEVEL/etherlink/lib_wasm_runtime" || exit 3 # shellcheck disable=SC2317 function cleanup() { diff --git a/src/lib_wasm_runtime/ocaml-api/.ocamlformat-ignore b/etherlink/lib_wasm_runtime/ocaml-api/.ocamlformat-ignore similarity index 100% rename from src/lib_wasm_runtime/ocaml-api/.ocamlformat-ignore rename to etherlink/lib_wasm_runtime/ocaml-api/.ocamlformat-ignore diff --git a/src/lib_wasm_runtime/ocaml-api/dune b/etherlink/lib_wasm_runtime/ocaml-api/dune similarity index 95% rename from src/lib_wasm_runtime/ocaml-api/dune rename to etherlink/lib_wasm_runtime/ocaml-api/dune index cd22899ba85de1f532305da2d2e02b3846a2fdbe..bc1de45c0b19662769a3abe04b641ef2eeaaede2 100644 --- a/src/lib_wasm_runtime/ocaml-api/dune +++ b/etherlink/lib_wasm_runtime/ocaml-api/dune @@ -7,7 +7,6 @@ (instrumentation (backend bisect_ppx)) (libraries octez-l2-libs.irmin_context - octez-rust-deps octez-evm-node-libs.wasm_runtime_callbacks) (flags (:standard) diff --git a/src/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.ml b/etherlink/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.ml similarity index 100% rename from src/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.ml rename to etherlink/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.ml diff --git a/src/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.mli b/etherlink/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.mli similarity index 100% rename from src/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.mli rename to etherlink/lib_wasm_runtime/ocaml-api/evm_node_wasm_runtime.mli diff --git a/src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml b/etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml similarity index 100% rename from src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml rename to etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml diff --git a/src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli b/etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli similarity index 100% rename from src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli rename to etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli diff --git a/src/lib_wasm_runtime/src/api.rs b/etherlink/lib_wasm_runtime/src/api.rs similarity index 100% rename from src/lib_wasm_runtime/src/api.rs rename to etherlink/lib_wasm_runtime/src/api.rs diff --git a/src/lib_wasm_runtime/src/bindings.rs b/etherlink/lib_wasm_runtime/src/bindings.rs similarity index 100% rename from src/lib_wasm_runtime/src/bindings.rs rename to etherlink/lib_wasm_runtime/src/bindings.rs diff --git a/src/lib_wasm_runtime/src/host.rs b/etherlink/lib_wasm_runtime/src/host.rs similarity index 100% rename from src/lib_wasm_runtime/src/host.rs rename to etherlink/lib_wasm_runtime/src/host.rs diff --git a/src/lib_wasm_runtime/src/lib.rs b/etherlink/lib_wasm_runtime/src/lib.rs similarity index 86% rename from src/lib_wasm_runtime/src/lib.rs rename to etherlink/lib_wasm_runtime/src/lib.rs index 079113ae3d7faecb5a457163b9254046f454a841..690294d6be0becf4bfe4b98d16cc9f85327f108d 100644 --- a/src/lib_wasm_runtime/src/lib.rs +++ b/etherlink/lib_wasm_runtime/src/lib.rs @@ -1,5 +1,7 @@ // SPDX-FileCopyrightText: 2024 Nomadic Labs +pub use rustzcash::*; + pub mod api; mod bindings; mod host; diff --git a/src/lib_wasm_runtime/src/runtime/env.rs b/etherlink/lib_wasm_runtime/src/runtime/env.rs similarity index 100% rename from src/lib_wasm_runtime/src/runtime/env.rs rename to etherlink/lib_wasm_runtime/src/runtime/env.rs diff --git a/src/lib_wasm_runtime/src/runtime/host_funcs.rs b/etherlink/lib_wasm_runtime/src/runtime/host_funcs.rs similarity index 100% rename from src/lib_wasm_runtime/src/runtime/host_funcs.rs rename to etherlink/lib_wasm_runtime/src/runtime/host_funcs.rs diff --git a/src/lib_wasm_runtime/src/runtime/mod.rs b/etherlink/lib_wasm_runtime/src/runtime/mod.rs similarity index 100% rename from src/lib_wasm_runtime/src/runtime/mod.rs rename to etherlink/lib_wasm_runtime/src/runtime/mod.rs diff --git a/src/lib_wasm_runtime/src/types.rs b/etherlink/lib_wasm_runtime/src/types.rs similarity index 100% rename from src/lib_wasm_runtime/src/types.rs rename to etherlink/lib_wasm_runtime/src/types.rs diff --git a/src/lib_wasm_runtime/src/write_debug.rs b/etherlink/lib_wasm_runtime/src/write_debug.rs similarity index 100% rename from src/lib_wasm_runtime/src/write_debug.rs rename to etherlink/lib_wasm_runtime/src/write_debug.rs diff --git a/src/lib_wasm_runtime_callbacks/dune b/etherlink/lib_wasm_runtime_callbacks/dune similarity index 100% rename from src/lib_wasm_runtime_callbacks/dune rename to etherlink/lib_wasm_runtime_callbacks/dune diff --git a/src/lib_wasm_runtime_callbacks/error_code.ml b/etherlink/lib_wasm_runtime_callbacks/error_code.ml similarity index 100% rename from src/lib_wasm_runtime_callbacks/error_code.ml rename to etherlink/lib_wasm_runtime_callbacks/error_code.ml diff --git a/src/lib_wasm_runtime_callbacks/error_code.mli b/etherlink/lib_wasm_runtime_callbacks/error_code.mli similarity index 100% rename from src/lib_wasm_runtime_callbacks/error_code.mli rename to etherlink/lib_wasm_runtime_callbacks/error_code.mli diff --git a/src/lib_wasm_runtime_callbacks/test/dune b/etherlink/lib_wasm_runtime_callbacks/test/dune similarity index 91% rename from src/lib_wasm_runtime_callbacks/test/dune rename to etherlink/lib_wasm_runtime_callbacks/test/dune index c30e6c0f76a30d7d4454b77390b4aab73d5201a2..87333a3000d2b555718764e2c2f962630c3e3560 100644 --- a/src/lib_wasm_runtime_callbacks/test/dune +++ b/etherlink/lib_wasm_runtime_callbacks/test/dune @@ -2,11 +2,10 @@ ; Edit file manifest/main.ml instead. (library - (name src_lib_wasm_runtime_callbacks_test_tezt_lib) + (name etherlink_lib_wasm_runtime_callbacks_test_tezt_lib) (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.base octez-libs.base.unix @@ -38,7 +37,7 @@ (name main) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - src_lib_wasm_runtime_callbacks_test_tezt_lib + etherlink_lib_wasm_runtime_callbacks_test_tezt_lib tezt) (link_flags (:standard) diff --git a/src/lib_wasm_runtime_callbacks/test/test_store.ml b/etherlink/lib_wasm_runtime_callbacks/test/test_store.ml similarity index 100% rename from src/lib_wasm_runtime_callbacks/test/test_store.ml rename to etherlink/lib_wasm_runtime_callbacks/test/test_store.ml diff --git a/src/lib_wasm_runtime_callbacks/test/test_store.mli b/etherlink/lib_wasm_runtime_callbacks/test/test_store.mli similarity index 100% rename from src/lib_wasm_runtime_callbacks/test/test_store.mli rename to etherlink/lib_wasm_runtime_callbacks/test/test_store.mli diff --git a/src/lib_wasm_runtime_callbacks/test/test_vector.ml b/etherlink/lib_wasm_runtime_callbacks/test/test_vector.ml similarity index 100% rename from src/lib_wasm_runtime_callbacks/test/test_vector.ml rename to etherlink/lib_wasm_runtime_callbacks/test/test_vector.ml diff --git a/src/lib_wasm_runtime_callbacks/test/test_vector.mli b/etherlink/lib_wasm_runtime_callbacks/test/test_vector.mli similarity index 100% rename from src/lib_wasm_runtime_callbacks/test/test_vector.mli rename to etherlink/lib_wasm_runtime_callbacks/test/test_vector.mli diff --git a/src/lib_wasm_runtime_callbacks/vector.ml b/etherlink/lib_wasm_runtime_callbacks/vector.ml similarity index 100% rename from src/lib_wasm_runtime_callbacks/vector.ml rename to etherlink/lib_wasm_runtime_callbacks/vector.ml diff --git a/src/lib_wasm_runtime_callbacks/vector.mli b/etherlink/lib_wasm_runtime_callbacks/vector.mli similarity index 100% rename from src/lib_wasm_runtime_callbacks/vector.mli rename to etherlink/lib_wasm_runtime_callbacks/vector.mli diff --git a/src/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.ml b/etherlink/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.ml similarity index 100% rename from src/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.ml rename to etherlink/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.ml diff --git a/src/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.mli b/etherlink/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.mli similarity index 100% rename from src/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.mli rename to etherlink/lib_wasm_runtime_callbacks/wasm_runtime_callbacks.mli diff --git a/etherlink/tezt/tests/dune b/etherlink/tezt/tests/dune index 46da67e66e87d6b09ac067ddc6bb93283d8a5403..9fd3f1294f38ba7bc5c39fcfe482d28ae02fe411 100644 --- a/etherlink/tezt/tests/dune +++ b/etherlink/tezt/tests/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-rust-deps bls12-381.archive octez-libs.test-helpers octez-libs.tezt-wrapper tezt-tezos tezt_etherlink octez-evm-node-libs.evm_node_lib_dev_encoding + octez-rustzcash-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 c2a69af1735d1a374f2afb46e4a08c31deb6c05c..796b70e401a37d33917c9709bf04e259b1f64d2f 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -21,8 +21,6 @@ include Product (struct let source = ["etherlink"; "src"] end) -let tezt ?(deps = []) = tezt ~deps:(octez_rust_deps :: bls12_381_archive :: deps) - let tezt_etherlink = private_lib "tezt_etherlink" @@ -69,6 +67,48 @@ let octez_evm_node_lib = ~container:registered_octez_evm_node_libs ~package:"octez-evm-node-libs" +let evm_node_rust_deps = + octez_evm_node_lib + "evm_node_rust_deps" + ~path:"etherlink/lib_wasm_runtime" + ~synopsis:"WASM runtime foreign archive" + ~foreign_archives:["octez_evm_node_rust_deps"] + ~dune: + Dune. + [ + [ + S "dirs"; + S ":standard"; + (* We need this stanza to ensure .cargo can be used as a + dependency via source_tree. *) + S ".cargo"; + (* Do not track Cargo output directory. *) + [S "not"; S "target"]; + ]; + [ + S "rule"; + [ + S "targets"; + S "liboctez_evm_node_rust_deps.a"; + S "dlloctez_evm_node_rust_deps.so"; + ]; + [ + S "deps"; + [S "file"; S "build.sh"]; + [S "file"; S "Cargo.toml"]; + [S "file"; S "Cargo.lock"]; + [S "file"; S "../../rust-toolchain"]; + [S "source_tree"; S ".cargo"]; + [S "source_tree"; S "../../src/rustzcash_deps"]; + [S "source_tree"; S "../../src/rust_deps/wasmer-3.3.0"]; + [S "source_tree"; S "src"]; + ]; + [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; + ]; + ] + +let tezt ?(deps = []) = tezt ~deps:(bls12_381_archive :: deps) + let evm_node_config = octez_evm_node_lib "evm_node_config" @@ -87,7 +127,7 @@ let evm_node_config = let wasm_runtime_callbacks = octez_evm_node_lib "wasm_runtime_callbacks" - ~path:"src/lib_wasm_runtime_callbacks" + ~path:"etherlink/lib_wasm_runtime_callbacks" ~synopsis: "Callbacks implementing the I/O functions required to implement the host \ functions of the WASM runtime" @@ -102,7 +142,7 @@ let wasm_runtime_callbacks = let _wasm_runtime_callbacks_tests = tezt ["test_vector"; "test_store"] - ~path:"src/lib_wasm_runtime_callbacks/test" + ~path:"etherlink/lib_wasm_runtime_callbacks/test" ~opam:"octez-evm-wasm-runtime-tests" ~synopsis:"Tests for the WASM Runtime" ~with_macos_security_framework:true @@ -123,14 +163,9 @@ let _wasm_runtime_callbacks_tests = let wasm_runtime = octez_evm_node_lib "evm_node_wasm_runtime" - ~path:"src/lib_wasm_runtime/ocaml-api" + ~path:"etherlink/lib_wasm_runtime/ocaml-api" ~synopsis:"WASM runtime compatible with the WASM PVM" - ~deps: - [ - octez_layer2_irmin_context |> open_; - octez_rust_deps; - wasm_runtime_callbacks; - ] + ~deps:[octez_layer2_irmin_context |> open_; wasm_runtime_callbacks] ~flags: (Flags.standard ~disable_warnings:[66] @@ -253,14 +288,26 @@ let evm_node_lib_dev = ] let _octez_evm_node_tests = - tezt + tests ["test_rlp"; "test_ethbloom"; "test_call_tracer_algo"; "test_wasm_runtime"] ~path:"etherlink/bin_node/test" ~opam:"octez-evm-node-tests" ~synopsis:"Tests for the EVM Node" ~with_macos_security_framework:true + ~linkall: + (* Necessary to get proper code coverage on Alpine working. Without this, + calling Rust FFI segfault. *) + true + ~dep_files: + [ + "rlptest.json"; + "invalidRLPTest.json"; + "../../kernel_evm/kernel/tests/resources/mainnet_evm_kernel.wasm"; + ] ~deps: [ + bls12_381_archive; + evm_node_rust_deps; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_base_test_helpers |> open_; @@ -268,8 +315,10 @@ let _octez_evm_node_tests = qcheck_alcotest; alcotezt; evm_node_lib_dev; + tezt_lib |> open_ |> open_ ~m:"Base"; tezt_wrapper |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_ |> open_ ~m:"Runnable.Syntax"; + tezt_etherlink |> open_; octez_layer2_irmin_context |> open_; Protocol.(main alpha); ] @@ -294,6 +343,7 @@ let _tezt_etherlink = tezt_tezos |> open_ |> open_ ~m:"Runnable.Syntax"; tezt_etherlink |> open_; evm_node_lib_dev_encoding; + octez_rustzcash_deps; Protocol.(main alpha); ] ~with_macos_security_framework:true @@ -315,7 +365,7 @@ let _evm_node = ~with_macos_security_framework:true ~deps: [ - octez_rust_deps; + evm_node_rust_deps; bls12_381_archive; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 6c91d8540ec00c331da6dbb46ac7259086fda392..79a21d8ddcfec76897a1ba6588b6720889de72b7 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -571,9 +571,6 @@ let octez_rust_deps = [S "source_tree"; S "src"]; [S "source_tree"; S "../riscv"]; [S "source_tree"; S "../kernel_sdk"]; - [S "file"; S "../../src/lib_wasm_runtime/Cargo.toml"]; - [S "file"; S "../../src/lib_wasm_runtime/build.rs"]; - [S "glob_files_rec"; S "../../src/lib_wasm_runtime/src/**.rs"]; ]; [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; ]; diff --git a/manifest/product_octez.mli b/manifest/product_octez.mli index b9fc7ac5a313cc01a779f15093988a07e57c17cb..b2c95b7d9b07fa20a6c03b797bee227026ea7219 100644 --- a/manifest/product_octez.mli +++ b/manifest/product_octez.mli @@ -55,6 +55,8 @@ val octez_rpc_http_server : Manifest.target val octez_rust_deps : Manifest.target +val octez_rustzcash_deps : Manifest.target + val octez_scoru_wasm_debugger_lib : Manifest.target val octez_scoru_wasm_debugger_plugin : Manifest.target diff --git a/opam/octez-evm-node-libs.opam b/opam/octez-evm-node-libs.opam index f8544b35ec9eda6cd66e89984f93da139f43e2e2..3809e383966dc83af7c1b60fa08ed7f79dc8456f 100644 --- a/opam/octez-evm-node-libs.opam +++ b/opam/octez-evm-node-libs.opam @@ -13,7 +13,6 @@ depends: [ "octez-libs" "octez-shell-libs" "octez-l2-libs" - "octez-rust-deps" "caqti-lwt" { >= "2.0.1" } "crunch" { >= "3.3.0" } "re" { >= "1.10.0" } diff --git a/opam/octez-evm-node-tests.opam b/opam/octez-evm-node-tests.opam index 7beb3399e95c0d7d7c994d409a8916b8106424c1..b25dc675cce4df75d87c0c404cf7e215ec71dd5b 100644 --- a/opam/octez-evm-node-tests.opam +++ b/opam/octez-evm-node-tests.opam @@ -10,14 +10,14 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} + "octez-evm-node-libs" { with-test & = version } "octez-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} - "octez-evm-node-libs" {with-test} + "tezt" { with-test & >= "4.1.0" & < "5.0.0" } "tezt-tezos" {with-test} + "tezt-etherlink" { with-test & = version } "octez-l2-libs" {with-test} "tezos-protocol-alpha" {with-test} ] diff --git a/opam/octez-evm-node.opam b/opam/octez-evm-node.opam index 0299241a6a17deb52cd14027d2ed6e332a203781..139ce8f6974218d9a475f75345e38ea014eaa8cd 100644 --- a/opam/octez-evm-node.opam +++ b/opam/octez-evm-node.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } - "octez-rust-deps" + "octez-evm-node-libs" { = version } "bls12-381" "octez-libs" "octez-version" "octez-shell-libs" "octez-l2-libs" - "octez-evm-node-libs" { = version } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-evm-wasm-runtime-tests.opam b/opam/octez-evm-wasm-runtime-tests.opam index c92c2bec7ede5bb3b9e69f1e98e42214d0d47404..3752bd804788be173bf82226051e9960e59a6299 100644 --- a/opam/octez-evm-wasm-runtime-tests.opam +++ b/opam/octez-evm-wasm-runtime-tests.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.11.1" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezt-etherlink.opam b/opam/tezt-etherlink.opam index 2c997a88eb10e76133879b63881b412ea672c49b..54089c7bc44796af69267c11a397c8c4a3bb2749 100644 --- a/opam/tezt-etherlink.opam +++ b/opam/tezt-etherlink.opam @@ -16,9 +16,9 @@ depends: [ "ppx_import" {with-test} "ppx_deriving" {with-test} "tezt" { with-test & >= "4.1.0" & < "5.0.0" } - "octez-rust-deps" {with-test} "bls12-381" {with-test} "octez-evm-node-libs" { with-test & = version } + "octez-rustzcash-deps" {with-test} "tezos-protocol-alpha" {with-test} ] build: [ diff --git a/script-inputs/ci-coverage-producing-jobs b/script-inputs/ci-coverage-producing-jobs index 9e9b6984f2ee8a0fce600ba690156e9ff6bbb507..4e0deebf76232fabf5af4b14af3e0c16b3401969 100644 --- a/script-inputs/ci-coverage-producing-jobs +++ b/script-inputs/ci-coverage-producing-jobs @@ -5,4 +5,5 @@ tezt-memory-3k tezt oc.unit:proto-x86_64 oc.unit:other-x86_64 +oc.unit:etherlink-x86_64 oc.unit:non-proto-x86_64 diff --git a/scripts/lint.sh b/scripts/lint.sh index 584de857312da83a45837463933e210aecc1480c..c534313db09a9e1aaff552a9cde770e72fd441c8 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -45,8 +45,8 @@ license_check_exclude=$( src/lib_protocol_environment/sigs/.* src/riscv/lib/octez_riscv_api.ml src/riscv/lib/octez_riscv_api.mli -src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml -src/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli +etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.ml +etherlink/lib_wasm_runtime/ocaml-api/wasm_runtime_gen.mli EOF ) diff --git a/src/lib_wasm_runtime/rust-toolchain b/src/lib_wasm_runtime/rust-toolchain deleted file mode 100644 index 1f3171c78fd2cb65f3f30cfc8f29f0dc46ca95ad..0000000000000000000000000000000000000000 --- a/src/lib_wasm_runtime/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.76.0 \ No newline at end of file diff --git a/src/rust_deps/Cargo.lock b/src/rust_deps/Cargo.lock index 8cb99250907859798af5c0de723605e43709203d..d7e9344970a41da914a85daa9dedab4b00a72a27 100644 --- a/src/rust_deps/Cargo.lock +++ b/src/rust_deps/Cargo.lock @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -84,43 +84,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arbitrary-int" @@ -419,9 +419,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cbindgen" @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -508,9 +508,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -518,13 +518,13 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.2", + "clap_lex 0.7.3", "strsim 0.11.1", ] @@ -537,7 +537,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -551,9 +551,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clearscreen" @@ -570,9 +570,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "const-oid" @@ -613,9 +613,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -824,7 +824,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -847,7 +847,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -858,7 +858,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -930,7 +930,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -981,6 +981,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "dynasm" version = "1.2.3" @@ -1122,7 +1133,7 @@ checksum = "1ccd72f8e71e242f71705868f5478fe7592a6e194c06330d8732421ffdbc554c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1143,30 +1154,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", + "syn 2.0.89", ] [[package]] @@ -1212,9 +1200,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "ff" @@ -1481,9 +1469,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hdwallet" @@ -1595,12 +1583,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.31" @@ -1624,6 +1606,124 @@ dependencies = [ "want", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1632,12 +1732,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1660,13 +1771,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -1695,7 +1806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -1730,9 +1841,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "js-sys" @@ -1771,15 +1882,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -1886,6 +1997,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -2176,7 +2293,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2214,9 +2331,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d51b05aa0083eaec54b22a3f2a3d49175e04b4fb77ca7abb5a85731736239c3" dependencies = [ - "cc", "proc-macro2", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2227,7 +2343,7 @@ checksum = "3de4a0decff0fd3ee0928dfa15dac08651157f8f814e93b34fdf962190354035" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2240,20 +2356,6 @@ dependencies = [ "cty", ] -[[package]] -name = "octez-evm-node-wasm-runtime" -version = "0.0.0-dev" -dependencies = [ - "env_logger", - "hex", - "log", - "ocaml", - "ocaml-build", - "tezos_crypto_rs", - "wasmer", - "wasmer-compiler-cranelift", -] - [[package]] name = "octez-riscv" version = "0.0.0" @@ -2288,7 +2390,6 @@ name = "octez-rust-deps" version = "0.0.0" dependencies = [ "librustzcash", - "octez-evm-node-wasm-runtime", "octez-riscv", "wasmer-c-api", ] @@ -2389,14 +2490,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -2550,9 +2651,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2648,9 +2749,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2895,13 +2996,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick 1.1.3", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -2916,9 +3017,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick 1.1.3", "memchr", @@ -3026,11 +3127,11 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_apfloat" -version = "0.2.1+llvm-462a31f5a5ab" +version = "0.2.2+llvm-462a31f5a5ab" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886d94c63c812a8037c4faca2607453a0fa4cf82f734665266876b022244543f" +checksum = "121e2195ff969977a4e2b5c9965ea867fce7e4cb5aee5b09dee698a7932d574f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "smallvec", ] @@ -3045,9 +3146,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -3091,7 +3192,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3135,9 +3236,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -3155,20 +3256,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -3351,7 +3452,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3373,15 +3474,26 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "tap" version = "1.0.1" @@ -3396,9 +3508,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -3490,7 +3602,7 @@ dependencies = [ name = "tezos-smart-rollup-utils" version = "0.2.2" dependencies = [ - "clap 4.5.20", + "clap 4.5.21", "hex", "quanta 0.12.3", "serde", @@ -3561,22 +3673,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3620,6 +3732,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -3637,9 +3759,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "libc", @@ -3658,7 +3780,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3724,7 +3846,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3778,17 +3900,11 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -3807,9 +3923,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "universal-hash" @@ -3829,15 +3945,27 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -3911,7 +4039,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -3956,7 +4084,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3969,12 +4097,12 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" +checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" dependencies = [ "leb128", - "wasmparser 0.219.1", + "wasmparser 0.220.0", ] [[package]] @@ -3995,7 +4123,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-downcast", "wasmer-compiler", - "wasmer-compiler-cranelift", "wasmer-derive", "wasmer-types", "wasmer-vm", @@ -4147,9 +4274,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.219.1" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" dependencies = [ "bitflags 2.6.0", "indexmap 2.6.0", @@ -4157,9 +4284,9 @@ dependencies = [ [[package]] name = "wast" -version = "219.0.1" +version = "220.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" +checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165" dependencies = [ "bumpalo", "leb128", @@ -4170,9 +4297,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.219.1" +version = "1.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc3cf014fb336883a411cd662f987abf6a1d2a27f2f0008616a0070bbf6bd0d" +checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3" dependencies = [ "wast", ] @@ -4364,6 +4491,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -4373,6 +4512,30 @@ dependencies = [ "tap", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + [[package]] name = "zcash_address" version = "0.1.0" @@ -4492,7 +4655,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -4512,5 +4696,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] diff --git a/src/rust_deps/Cargo.toml b/src/rust_deps/Cargo.toml index dd3040c651a123349be615efd73d35d91326aba9..d12cb4e0b5dbb3eec1b8e14bc54bc4eed9a591a7 100644 --- a/src/rust_deps/Cargo.toml +++ b/src/rust_deps/Cargo.toml @@ -17,6 +17,3 @@ path = "../rustzcash_deps" [dependencies.octez-riscv] path = "../riscv/lib" features = ["ocaml-api"] - -[dependencies.octez-evm-node-wasm-runtime] -path = "../../src/lib_wasm_runtime" diff --git a/src/rust_deps/dune b/src/rust_deps/dune index 4e6bc21230dc0794c28dc4562da748cfc201b2af..3da9488fcc8e0590cf14ccea494de86177de4f13 100644 --- a/src/rust_deps/dune +++ b/src/rust_deps/dune @@ -21,8 +21,5 @@ (source_tree wasmer-3.3.0) (source_tree src) (source_tree ../riscv) - (source_tree ../kernel_sdk) - (file ../../src/lib_wasm_runtime/Cargo.toml) - (file ../../src/lib_wasm_runtime/build.rs) - (glob_files_rec ../../src/lib_wasm_runtime/src/**.rs)) + (source_tree ../kernel_sdk)) (action (no-infer (bash ./build.sh)))) diff --git a/src/rust_deps/src/lib.rs b/src/rust_deps/src/lib.rs index b47795a4936ff9a06a3c33552635fd704a8d5da7..c9c0d21a1c7d18ab84465a05c8a93212ce4ba0ea 100644 --- a/src/rust_deps/src/lib.rs +++ b/src/rust_deps/src/lib.rs @@ -1,4 +1,3 @@ -pub use octez_evm_node_wasm_runtime::api::*; pub use octez_riscv::ocaml_api::*; pub use rustzcash::*; pub use wasmer::*; diff --git a/tezt/tests/dune b/tezt/tests/dune index 6f989205eed52ff2437f1990d838643f869a1bc2..60562da7c4e4d8414c74e8cc9698aa582d1f263a 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -65,7 +65,6 @@ src_lib_workers_test_tezt_lib src_lib_webassembly_tests_tezt_lib src_lib_wasmer_test_tezt_lib - src_lib_wasm_runtime_callbacks_test_tezt_lib src_lib_version_test_tezt_lib src_lib_tree_encoding_test_tezt_lib src_lib_store_unix_test_tezt_lib @@ -124,7 +123,7 @@ irmin_test_irmin_tezt_lib irmin_test_tezt_lib etherlink_tezt_tests_tezt_lib - etherlink_bin_node_test_tezt_lib + etherlink_lib_wasm_runtime_callbacks_test_tezt_lib brassaia_test_brassaia_generic_key_tezt_lib brassaia_test_brassaia_data_tezt_lib brassaia_test_brassaia_tezos_tezt_lib