From 5dd688ab29eadcb7d3fa1abd848db82c1bcbdf7f Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Cornilleau Date: Wed, 5 Mar 2025 13:11:52 +0100 Subject: [PATCH] Tezlink/L2 node: add proto plugin to evm node deps --- etherlink/bin_node/lib_dev/dune | 3 ++- manifest/product_etherlink.ml | 9 +++++++++ manifest/product_octez.mli | 2 ++ opam/octez-evm-node-libs.opam | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/etherlink/bin_node/lib_dev/dune b/etherlink/bin_node/lib_dev/dune index fbda79166806..009cf739edae 100644 --- a/etherlink/bin_node/lib_dev/dune +++ b/etherlink/bin_node/lib_dev/dune @@ -36,7 +36,8 @@ tezos-dal-node-services octez-evm-node-libs.evm_node_supported_installers octez-evm-node-libs.evm_node_wasm_runtime - octez-performance-metrics) + octez-performance-metrics + octez-protocol-021-PsQuebec-libs.plugin) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index ddb8caf93ce6..d4753f74fe04 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -260,6 +260,14 @@ let evm_node_config = ] let evm_node_lib_dev = + let quebec = + List.find (fun proto -> Protocol.short_hash proto = "PsQuebec") Protocol.all + in + let plugin = + match Protocol.plugin quebec with + | Some target -> target + | None -> (* unreachable *) assert false + in octez_evm_node_lib "evm_node_lib_dev" ~path:"etherlink/bin_node/lib_dev" @@ -299,6 +307,7 @@ let evm_node_lib_dev = supported_installers; wasm_runtime; performance_metrics; + plugin; ] let evm_node_lib_dev_client = diff --git a/manifest/product_octez.mli b/manifest/product_octez.mli index 427ce62058e6..4cd3e756e969 100644 --- a/manifest/product_octez.mli +++ b/manifest/product_octez.mli @@ -127,6 +127,8 @@ module Protocol : sig val main : t -> Manifest.target + val plugin : t -> Manifest.target option + val alpha : t (** List of all protocols. *) diff --git a/opam/octez-evm-node-libs.opam b/opam/octez-evm-node-libs.opam index c7ecc880ed78..6de07ec6ffd5 100644 --- a/opam/octez-evm-node-libs.opam +++ b/opam/octez-evm-node-libs.opam @@ -32,6 +32,7 @@ depends: [ "octez-smart-rollup-wasm-debugger-lib" "tezos-dal-node-services" "octez-performance-metrics" + "octez-protocol-021-PsQuebec-libs" ] conflicts: [ "websocket" -- GitLab