From c5e4849cd7db0e0548ffa0ed65c4ff87d4189c98 Mon Sep 17 00:00:00 2001 From: Alain Mebsout Date: Tue, 5 Nov 2024 13:02:17 +0100 Subject: [PATCH] Build: add dream as a dependency to the EVM node --- cohttp/cohttp-lwt-unix/src/io.ml | 1 + etherlink/bin_node/lib_dev/dune | 1 + flake.lock | 6 +-- manifest/externals.ml | 10 ++-- manifest/product_etherlink.ml | 1 + opam/octez-evm-node-libs.opam | 1 + opam/octez-libs.opam | 4 +- opam/octez-node.opam | 2 +- opam/octez-teztale.opam | 6 +-- opam/virtual/octez-deps.opam | 9 ++-- opam/virtual/octez-deps.opam.locked | 77 +++++++++++++++++++---------- scripts/version.sh | 2 +- 12 files changed, 75 insertions(+), 45 deletions(-) diff --git a/cohttp/cohttp-lwt-unix/src/io.ml b/cohttp/cohttp-lwt-unix/src/io.ml index 24e2d9669436..1da4bcbda266 100644 --- a/cohttp/cohttp-lwt-unix/src/io.ml +++ b/cohttp/cohttp-lwt-unix/src/io.ml @@ -88,6 +88,7 @@ let wait_eof_or_closed conn ic sleep_fn = let wait_for_cancel () = fst (Lwt.task ()) in match (conn : Conduit_lwt_unix.flow) with | Vchan _ -> wait_for_cancel () + | Tunnel _ -> wait_for_cancel () | TCP {fd; _} | Domain_socket {fd; _} -> let peek_buffer = Bytes.create 1 in let has_recv_eof fd = diff --git a/etherlink/bin_node/lib_dev/dune b/etherlink/bin_node/lib_dev/dune index 5c4836bc8656..90f2cd669361 100644 --- a/etherlink/bin_node/lib_dev/dune +++ b/etherlink/bin_node/lib_dev/dune @@ -9,6 +9,7 @@ octez-libs.base octez-libs.rpc-http octez-libs.rpc-http-server + dream octez-libs.tezos-workers octez-libs.rpc-http-client-unix octez-version.value diff --git a/flake.lock b/flake.lock index 2345aea7653d..0183fddfbe45 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "opam-repository": { "flake": false, "locked": { - "lastModified": 1730116182, - "narHash": "sha256-2ci69XsboLd3PKtCbSW/fuqYnt5hg3kg+sZTEzCkJfs=", + "lastModified": 1730731085, + "narHash": "sha256-RmibDeHeQCNWiJbnOKLbpbhb8BKuUpLdOPPlX6Kl220=", "owner": "ocaml", "repo": "opam-repository", - "rev": "924ed6223cc22c606b7d5e7bb9793eaa1519e708", + "rev": "8476aa70b71db29af398e70bb8a00298c1e64b86", "type": "github" }, "original": { diff --git a/manifest/externals.ml b/manifest/externals.ml index fc42362acff3..8d16d1c4ea4c 100644 --- a/manifest/externals.ml +++ b/manifest/externals.ml @@ -77,9 +77,9 @@ let cmdliner = external_lib "cmdliner" V.(at_least "1.1.0") let cohttp = external_lib "cohttp" V.(at_least "5.3.1") -let conduit_lwt = external_lib "conduit-lwt" V.(exactly "6.2.2") +let conduit_lwt = external_lib "conduit-lwt" V.(at_least "7.1.0") -let conduit_lwt_unix = external_lib "conduit-lwt-unix" V.(exactly "6.2.2") +let conduit_lwt_unix = external_lib "conduit-lwt-unix" V.(at_least "7.1.0") let compiler_libs_common = external_lib "compiler-libs.common" V.True ~opam:"" @@ -103,6 +103,8 @@ let ctypes_stubs = external_sublib ctypes "ctypes.stubs" let digestif = external_lib "digestif" V.(at_least "0.9.0") +let dream = external_lib "dream" V.(at_least "1.0.0~alpha7") + let dune_configurator = external_lib "dune-configurator" V.True let dynlink = external_lib "dynlink" V.True ~opam:"" @@ -264,7 +266,7 @@ let tar_unix = external_lib "tar-unix" V.(at_least "2.0.1" && less_than "3.0.0") let tezos_sapling_parameters = opam_only ~can_vendor:false "tezos-sapling-parameters" V.(at_least "1.1.0") -let tls_lwt = external_lib "tls-lwt" V.(at_least "0.16.0") +let tls_lwt = external_lib "tls-lwt" V.(at_least "1.0.4") let trace = external_lib "trace" V.True @@ -308,7 +310,7 @@ let tezt_lib = let tezt_core_lib = external_sublib tezt_lib "tezt.core" ~main_module:"Tezt_core" -let x509 = external_lib "x509" V.(less_than "1.0.0") +let x509 = external_lib "x509" V.(at_least "1.0.0") let tezt_json_lib = external_sublib tezt_lib "tezt.json" ~main_module:"JSON" diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index 796b70e401a3..1a114bfa9cc3 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -260,6 +260,7 @@ let evm_node_lib_dev = octez_base |> open_ ~m:"TzPervasives"; octez_rpc_http |> open_; octez_rpc_http_server; + dream; octez_workers |> open_; octez_rpc_http_client_unix; octez_version_value; diff --git a/opam/octez-evm-node-libs.opam b/opam/octez-evm-node-libs.opam index 3809e383966d..465a11e7e5ab 100644 --- a/opam/octez-evm-node-libs.opam +++ b/opam/octez-evm-node-libs.opam @@ -17,6 +17,7 @@ depends: [ "crunch" { >= "3.3.0" } "re" { >= "1.10.0" } "octez-smart-rollup-wasm-debugger-plugin" + "dream" { >= "1.0.0~alpha7" } "octez-version" "lwt-watcher" { = "0.2" } "lwt-exit" diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 4d0af901ac50..859fab76a193 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -25,9 +25,9 @@ depends: [ "cohttp" { >= "5.3.1" } "logs" "fmt" { >= "0.8.7" } - "conduit-lwt" { = "6.2.2" } + "conduit-lwt" { >= "7.1.0" } "magic-mime" { >= "1.3.1" } - "conduit-lwt-unix" { = "6.2.2" } + "conduit-lwt-unix" { >= "7.1.0" } "lwt_ppx" "mtime" { >= "2.0.0" } "opentelemetry" diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 25b5b393fab0..3c747129061a 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -19,7 +19,7 @@ depends: [ "octez-rpc-process" { = version } "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } - "tls-lwt" { >= "0.16.0" } + "tls-lwt" { >= "1.0.4" } "lwt-exit" "uri" { >= "3.1.0" } "tezos-protocol-000-Ps9mPmXa" { = version } diff --git a/opam/octez-teztale.opam b/opam/octez-teztale.opam index c1723aeea5c7..eb2d2e244f05 100644 --- a/opam/octez-teztale.opam +++ b/opam/octez-teztale.opam @@ -23,9 +23,9 @@ depends: [ "cmdliner" { >= "1.1.0" } "octez-rust-deps" "octez-shell-libs" - "tls-lwt" { >= "0.16.0" } - "conduit-lwt-unix" { = "6.2.2" } - "x509" { < "1.0.0" } + "tls-lwt" { >= "1.0.4" } + "conduit-lwt-unix" { >= "7.1.0" } + "x509" { >= "1.0.0" } ] depopts: [ "octez-protocol-001-PtCJ7pwo-libs" diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 12216f5264a5..b89ea4b7386f 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -33,8 +33,8 @@ depends: [ "class_group_vdf" { >= "0.0.4" } "cmdliner" { >= "1.1.0" } "cohttp" { >= "5.3.1" } - "conduit-lwt" { = "6.2.2" } - "conduit-lwt-unix" { = "6.2.2" } + "conduit-lwt" { >= "7.1.0" } + "conduit-lwt-unix" { >= "7.1.0" } "conf-libev" "conf-rust" "crowbar" { >= "0.2" } @@ -43,6 +43,7 @@ depends: [ "ctypes-foreign" { >= "0.18.0" } "digestif" { >= "0.9.0" } "dmap" + "dream" { >= "1.0.0~alpha7" } "dune-configurator" "eqaf" "ezgzip" @@ -108,11 +109,11 @@ depends: [ "tezos-sapling-parameters" { >= "1.1.0" } "tezt" { >= "4.1.0" & < "5.0.0" } "tezt-bam" { >= "0.3" } - "tls-lwt" { >= "0.16.0" } + "tls-lwt" { >= "1.0.4" } "uri" { >= "3.1.0" } "uutf" "vector" - "x509" { < "1.0.0" } + "x509" { >= "1.0.0" } "yaml" { >= "3.1.0" } "zarith" { >= "1.13" & < "1.14" } ] diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked index 38c143ebc432..0bad6086798c 100644 --- a/opam/virtual/octez-deps.opam.locked +++ b/opam/virtual/octez-deps.opam.locked @@ -1,6 +1,6 @@ opam-version: "2.0" name: "octez-deps" -version: "dev" +version: "~dev" synopsis: "Virtual package depending on Octez dependencies (profile: octez-deps)" description: @@ -19,7 +19,7 @@ depends: [ "ambient-context" {= "0.1.0"} "angstrom" {= "0.16.1"} "asetmap" {= "0.8.1"} - "asn1-combinators" {= "0.2.6"} + "asn1-combinators" {= "0.3.2"} "astring" {= "0.8.5"} "bam" {= "0.3"} "bam-ppx" {= "0.3"} @@ -31,11 +31,12 @@ depends: [ "base64" {= "3.5.1"} "bheap" {= "2.0.0"} "bigarray-compat" {= "1.1.0"} + "bigarray-overlap" {= "0.2.1"} "bigstring" {= "0.3"} "bigstringaf" {= "0.10.0"} "bisect_ppx" {= "2.8.3"} "bos" {= "0.2.1"} - "ca-certs" {= "0.2.3"} + "ca-certs" {= "1.0.0"} "camlp-streams" {= "5.0.1"} "camlzip" {= "1.12"} "caqti" {= "2.1.2"} @@ -48,9 +49,9 @@ depends: [ "class_group_vdf" {= "0.0.5"} "cmdliner" {= "1.3.0"} "cohttp" {= "5.3.1"} - "conduit" {= "6.2.2"} - "conduit-lwt" {= "6.2.2"} - "conduit-lwt-unix" {= "6.2.2"} + "conduit" {= "7.1.0"} + "conduit-lwt" {= "7.1.0"} + "conduit-lwt-unix" {= "7.1.0"} "conf-autoconf" {= "0.2"} "conf-bash" {= "1"} "conf-cmake" {= "1"} @@ -60,6 +61,7 @@ depends: [ "conf-hidapi" {= "0"} "conf-libev" {= "4-12"} "conf-libffi" {= "2.0.0"} + "conf-libssl" {= "4"} "conf-pkg-config" {= "3"} "conf-postgresql" {= "1"} "conf-rust" {= "0.1"} @@ -78,28 +80,36 @@ depends: [ "digestif" {= "1.2.0"} "dmap" {= "0.5"} "domain-name" {= "0.4.0"} - "dune" {= "3.16.0"} - "dune-build-info" {= "3.16.0"} - "dune-configurator" {= "3.16.0"} - "dune-private-libs" {= "3.16.0"} - "dune-site" {= "3.16.0"} + "dream" {= "1.0.0~alpha7"} + "dream-httpaf" {= "1.0.0~alpha3"} + "dream-pure" {= "1.0.0~alpha2"} + "dune" {= "3.16.1"} + "dune-build-info" {= "3.16.1"} + "dune-configurator" {= "3.16.1"} + "dune-private-libs" {= "3.16.1"} + "dune-site" {= "3.16.1"} "duration" {= "0.2.1"} - "dyn" {= "3.16.0"} + "dyn" {= "3.16.1"} "either" {= "1.0.0"} - "eqaf" {= "0.9"} + "eqaf" {= "0.10"} "ezgzip" {= "0.2.3"} "ezjsonm" {= "1.3.0"} + "faraday" {= "0.8.2"} + "faraday-lwt" {= "0.8.2"} + "faraday-lwt-unix" {= "0.8.2"} "fix" {= "20230505"} "fmt" {= "0.9.0"} "fpath" {= "0.7.3"} "gmap" {= "0.3.0"} + "graphql" {= "0.14.0"} + "graphql-lwt" {= "0.14.0"} + "graphql_parser" {= "0.14.0"} "hacl-star" {= "0.7.2"} "hacl-star-raw" {= "0.7.2"} "hashcons" {= "1.4.0"} "hex" {= "1.5.0"} "hidapi" {= "1.2.1"} "hidapi-lwt" {= "1.2.1"} - "hkdf" {= "1.0.4"} "hmap" {= "0.8.1"} "index" {= "1.6.2"} "integers" {= "0.7.0"} @@ -109,20 +119,25 @@ depends: [ "jingoo" {= "1.5.0"} "jsonm" {= "1.0.2"} "jst-config" {= "v0.16.0"} + "kdf" {= "1.0.0"} + "ke" {= "0.6"} "lambda-term" {= "3.3.2"} + "lambdasoup" {= "1.1.1"} "ledgerwallet" {= "0.4.1"} "ledgerwallet-tezos" {= "0.4.1"} "logs" {= "0.7.0"} "lru" {= "0.3.1"} - "lwt" {= "5.7.0"} + "lwt" {= "5.8.0"} "lwt-canceler" {= "0.3"} "lwt-dllist" {= "1.0.1"} "lwt-exit" {= "1.0"} "lwt-watcher" {= "0.2"} - "lwt_ppx" {= "2.1.0"} + "lwt_ppx" {= "5.8.0"} "lwt_react" {= "1.2.0"} + "lwt_ssl" {= "1.2.0"} "macaddr" {= "5.6.0"} "magic-mime" {= "1.3.1"} + "markup" {= "1.0.3"} "memtrace" {= "0.2.3"} "menhir" {= "20240715"} "menhirCST" {= "20240715"} @@ -130,12 +145,15 @@ depends: [ "menhirSdk" {= "20240715"} "mew" {= "0.1.0"} "mew_vi" {= "0.5.0"} - "mirage-crypto" {= "0.11.3"} - "mirage-crypto-ec" {= "0.11.3"} - "mirage-crypto-pk" {= "0.11.3"} - "mirage-crypto-rng" {= "0.11.3"} - "mirage-crypto-rng-lwt" {= "0.11.3"} + "mirage-clock" {= "4.2.0"} + "mirage-crypto" {= "1.1.0"} + "mirage-crypto-ec" {= "1.1.0"} + "mirage-crypto-pk" {= "1.1.0"} + "mirage-crypto-rng" {= "1.1.0"} + "mirage-crypto-rng-lwt" {= "1.1.0"} "mtime" {= "2.1.0"} + "multipart_form" {= "0.6.0"} + "multipart_form-lwt" {= "0.6.0"} "num" {= "1.5-1"} "ocaml" {= "4.14.2"} "ocaml-base-compiler" {= "4.14.2"} @@ -152,12 +170,13 @@ depends: [ "ocp-indent" {= "1.8.1"} "ocp-ocamlres" {= "0.4"} "ocplib-endian" {= "1.2"} + "ohex" {= "0.2.0"} "opentelemetry" {= "0.10"} "optint" {= "0.3.0"} - "ordering" {= "3.16.0"} + "ordering" {= "3.16.1"} "parsexp" {= "v0.16.0"} - "pbkdf" {= "1.2.0"} "pbrt" {= "3.1.1"} + "pecu" {= "0.7"} "postgresql" {= "5.0.0"} "pp" {= "1.2.0"} "pprint" {= "20230830"} @@ -181,6 +200,7 @@ depends: [ "prbnmcn-basic-structures" {= "0.0.1"} "prbnmcn-linalg" {= "0.0.1"} "prbnmcn-stats" {= "0.0.6"} + "prettym" {= "0.0.3"} "pringo" {= "1.3"} "progress" {= "0.4.0"} "psq" {= "0.2.1"} @@ -204,12 +224,13 @@ depends: [ "sexplib" {= "v0.16.0"} "sexplib0" {= "v0.16.0"} "sqlite3" {= "5.2.0"} + "ssl" {= "0.7.0"} "stdcompat" {= "19"} "stdint" {= "0.7.2"} "stdio" {= "v0.16.0"} "stdlib-random" {= "1.2.0"} "stdlib-shims" {= "0.3.0"} - "stdune" {= "3.16.0"} + "stdune" {= "3.16.1"} "stringext" {= "1.6.0"} "tar" {= "2.6.0"} "tar-unix" {= "2.6.0"} @@ -218,19 +239,21 @@ depends: [ "tezt" {= "4.1.0"} "tezt-bam" {= "0.3"} "time_now" {= "v0.16.0"} - "tls" {= "0.17.5"} - "tls-lwt" {= "0.17.5"} + "tls" {= "1.0.4"} + "tls-lwt" {= "1.0.4"} "topkg" {= "1.0.7"} "trie" {= "1.0.0"} "uchar" {= "0.0.2"} + "unstrctrd" {= "0.4"} "uri" {= "4.4.0"} "uri-sexp" {= "4.4.0"} "uucp" {= "16.0.0"} "uuseg" {= "16.0.0"} "uutf" {= "1.0.3"} "vector" {= "1.0.0"} - "x509" {= "0.16.5"} + "x509" {= "1.0.5"} "yaml" {= "3.2.0"} + "yojson" {= "2.2.2"} "zarith" {= "1.13"} "zed" {= "3.2.3"} ] diff --git a/scripts/version.sh b/scripts/version.sh index 53ffafcb937c..f46926775288 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -24,7 +24,7 @@ export recommended_node_version=18.18.2 ## opam_repository is a commit hash of the public opam repository, i.e. ## https://github.com/ocaml/opam-repository -export opam_repository_tag=924ed6223cc22c606b7d5e7bb9793eaa1519e708 +export opam_repository_tag=8476aa70b71db29af398e70bb8a00298c1e64b86 # SHA-256 hashes of the DAL SRSs, as used in 'scripts/install_dal_trusted_setup.sh' to verify # integrity of downloaded SRS. -- GitLab