diff --git a/etherlink/bin_node/lib_dev/blueprint_events.ml b/etherlink/bin_node/lib_dev/blueprint_events.ml index aa2b5958f376971db5eafab44fa87b8f291a477a..b215864d40b41a6aa0b45e4da706c47038cde4d5 100644 --- a/etherlink/bin_node/lib_dev/blueprint_events.ml +++ b/etherlink/bin_node/lib_dev/blueprint_events.ml @@ -7,12 +7,12 @@ include Internal_event.Simple -let section = ["evm_node"; "dev"; "blueprint"] +let section = Events.section let publisher_ready = declare_0 ~section - ~name:"evm_node_dev_blueprint_publisher_is_ready" + ~name:"blueprint_publisher_is_ready" ~msg:"Blueprint publisher is ready" ~level:Info () @@ -20,7 +20,7 @@ let publisher_ready = let publisher_shutdown = declare_0 ~section - ~name:"evm_node_dev_blueprint_publisher_shutdown" + ~name:"blueprint_publisher_shutdown" ~msg:"Blueprint publishing is shutting down" ~level:Info () @@ -28,7 +28,7 @@ let publisher_shutdown = let blueprint_application = declare_1 ~section - ~name:"evm_node_dev_blueprint_application" + ~name:"blueprint_application" ~msg:"Applied a blueprint for level {level}" ~level:Notice ("level", Data_encoding.n) @@ -36,7 +36,7 @@ let blueprint_application = let blueprint_injection = declare_1 ~section - ~name:"evm_node_dev_blueprint_injection" + ~name:"blueprint_injection" ~msg:"Injecting a blueprint for level {level}" ~level:Info ("level", Data_encoding.n) @@ -44,7 +44,7 @@ let blueprint_injection = let worker_enters_degraded_mode = declare_1 ~section - ~name:"evm_node_dev_blueprint_degraded" + ~name:"blueprint_degraded" ~msg: "Could not inject a blueprint for level {level}, entering degraded mode" ~level:Error @@ -53,7 +53,7 @@ let worker_enters_degraded_mode = let invalid_blueprint = declare_1 ~section - ~name:"evm_node_dev_blueprint_invalid" + ~name:"blueprint_invalid" ~msg:"Produced an invalid blueprint at level {level}" ~level:Error ("level", Data_encoding.n) diff --git a/etherlink/bin_node/lib_dev/delayed_inbox_events.ml b/etherlink/bin_node/lib_dev/delayed_inbox_events.ml index 46d7997fc19880f05c6134dd0d923256622e7102..c37d9956a2b508102be839d038fb05933596dd57 100644 --- a/etherlink/bin_node/lib_dev/delayed_inbox_events.ml +++ b/etherlink/bin_node/lib_dev/delayed_inbox_events.ml @@ -8,12 +8,12 @@ module Event = struct open Internal_event.Simple - let section = ["evm_node"; "dev"; "delayed-inbox"] + let section = Events.section let started = declare_0 ~section - ~name:"evm_node_dev_delayed_inbox_started" + ~name:"delayed_inbox_started" ~msg:"Delayed inbox has been started" ~level:Notice () @@ -21,7 +21,7 @@ module Event = struct let add_transaction = declare_1 ~section - ~name:"evm_node_dev_delayed_inbox_add_transaction" + ~name:"delayed_inbox_add_transaction" ~msg:"Add delayed transaction {transaction} to the tx-pool" ~level:Notice ("transaction", Ethereum_types.Delayed_transaction.encoding) @@ -32,7 +32,7 @@ module Event = struct let fetch_succeeded = declare_2 ~section - ~name:"evm_node_dev_delayed_inbox_fetch_succeeded" + ~name:"delayed_inbox_fetch_succeeded" ~msg: "Fetching delayed inbox for level {level} succeeded, {nb} new \ transactions fetched" @@ -45,7 +45,7 @@ module Event = struct let fetch_failed = declare_1 ~section - ~name:"evm_node_dev_delayed_inbox_fetch_failed" + ~name:"delayed_inbox_fetch_failed" ~msg:"Fetching delayed inbox for level {level} failed" ~level:Error ("level", Data_encoding.int32) @@ -54,7 +54,7 @@ module Event = struct let transaction_fetch_failed = declare_2 ~section - ~name:"evm_node_dev_delayed_inbox_transaction_fetch_failed" + ~name:"delayed_inbox_transaction_fetch_failed" ~msg: "Fetching transaction {tx_hash} from delayed inbox for level {level} \ failed" @@ -67,7 +67,7 @@ module Event = struct let connection_lost = declare_0 ~section - ~name:"evm_node_dev_delayed_inbox_connection_lost" + ~name:"delayed_inbox_connection_lost" ~msg:"Connection with the rollup node has been lost" ~level:Error () @@ -75,7 +75,7 @@ module Event = struct let stopped = declare_0 ~section - ~name:"evm_node_dev_delayed_inbox_stopped" + ~name:"delayed_inbox_stopped" ~msg:"Delayed inbox has been stopped" ~level:Notice () @@ -83,7 +83,7 @@ module Event = struct let shutdown = declare_0 ~section - ~name:"evm_node_dev_shutting_down_delayed_inbox" + ~name:"shutting_down_delayed_inbox" ~msg:"Stopping the delayed inbox" ~level:Notice () diff --git a/etherlink/bin_node/lib_dev/events.ml b/etherlink/bin_node/lib_dev/events.ml index 52132e10cdc7b4d363cdc947f15e4dad6ec854d6..7ac92a0e33d6bfd8bb884fc90cd1f4930ed7b75a 100644 --- a/etherlink/bin_node/lib_dev/events.ml +++ b/etherlink/bin_node/lib_dev/events.ml @@ -7,12 +7,12 @@ include Internal_event.Simple -let section = ["evm_node"; "dev"; "events"] +let section = ["evm_node"; "dev"] let received_upgrade = declare_1 ~section - ~name:"evm_node_dev_received_upgrade" + ~name:"received_upgrade" ~msg:"Received an upgrade payload: {payload}" ~level:Notice ("payload", Data_encoding.string) @@ -20,7 +20,7 @@ let received_upgrade = let ignored_kernel_arg = declare_0 ~section - ~name:"evm_node_dev_ignored_kernel_arg" + ~name:"ignored_kernel_arg" ~msg: "Ignored the kernel command-line argument since the EVM state was \ already initialized" diff --git a/etherlink/bin_node/lib_dev/events.mli b/etherlink/bin_node/lib_dev/events.mli index 055362dc42dcaa516aa14098a31d18f9d4c1e960..5a9b3abc73364b93bfa3fb153422e0732412a5dc 100644 --- a/etherlink/bin_node/lib_dev/events.mli +++ b/etherlink/bin_node/lib_dev/events.mli @@ -7,6 +7,9 @@ (** General purposes events. *) +(** Default section for events. *) +val section : string list + (** [received_upgrade payload] advertises that the sequencer received an upgrade of payload [payload]. *) val received_upgrade : string -> unit Lwt.t diff --git a/etherlink/bin_node/lib_dev/tx_pool_events.ml b/etherlink/bin_node/lib_dev/tx_pool_events.ml index b6b741e977c7e31bdf4847e5a46653da2dc52e9d..4fce23c254207324788c3110a769aa0eb56ea1c8 100644 --- a/etherlink/bin_node/lib_dev/tx_pool_events.ml +++ b/etherlink/bin_node/lib_dev/tx_pool_events.ml @@ -8,12 +8,12 @@ module Event = struct open Internal_event.Simple - let section = ["evm_node"; "dev"; "tx_pool"] + let section = Events.section let started = declare_0 ~section - ~name:"evm_node_dev_tx_pool_started" + ~name:"tx_pool_started" ~msg:"Tx-pool has been started" ~level:Notice () @@ -21,7 +21,7 @@ module Event = struct let add_transaction = declare_1 ~section - ~name:"evm_node_dev_tx_pool_add_transaction" + ~name:"tx_pool_add_transaction" ~msg:"Add transaction {transaction} to the tx-pool" ~level:Info ("transaction", Data_encoding.string) @@ -30,7 +30,7 @@ module Event = struct let invalid_transaction = declare_1 ~section - ~name:"evm_node_dev_tx_pool_invalid_transaction" + ~name:"tx_pool_invalid_transaction" ~msg:"Transaction {transaction} is not valid" ~level:Info ("transaction", Data_encoding.string) @@ -39,7 +39,7 @@ module Event = struct let transaction_injected = declare_1 ~section - ~name:"evm_node_dev_tx_pool_transaction_injected" + ~name:"tx_pool_transaction_injected" ~msg:"Transaction {transaction} has been injected" ~level:Info ("transaction", Ethereum_types.hash_encoding) @@ -48,7 +48,7 @@ module Event = struct let transaction_injection_failed = declare_0 ~section - ~name:"evm_node_dev_tx_pool_transaction_injection_failed" + ~name:"tx_pool_transaction_injection_failed" ~msg:"Injection of transactions failed" ~level:Error () @@ -56,7 +56,7 @@ module Event = struct let connection_lost = declare_0 ~section - ~name:"evm_node_dev_tx_pool_connection_lost" + ~name:"tx_pool_connection_lost" ~msg:"Connection with the rollup node has been lost, retrying..." ~level:Error () @@ -64,7 +64,7 @@ module Event = struct let stopped = declare_0 ~section - ~name:"evm_node_dev_tx_pool_stopped" + ~name:"tx_pool_stopped" ~msg:"Tx-pool has been stopped" ~level:Notice () @@ -72,7 +72,7 @@ module Event = struct let shutdown = declare_0 ~section - ~name:"evm_node_dev_shutting_down_tx_pool" + ~name:"shutting_down_tx_pool" ~msg:"Stopping the tx-pool" ~level:Notice () diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml index 2c0af7700b6261d58fdaa98e1615831dd27d4b74..2e6b046219767655a1a8ca858dec0ef721c479f6 100644 --- a/etherlink/bin_node/main.ml +++ b/etherlink/bin_node/main.ml @@ -32,7 +32,7 @@ module Event = struct let event_starting = Internal_event.Simple.declare_1 ~section - ~name:"evm_node_start" + ~name:"start" ~msg:"starting the EVM node ({mode})" ~level:Notice ("mode", Data_encoding.string) @@ -40,7 +40,7 @@ module Event = struct let event_is_ready = Internal_event.Simple.declare_2 ~section - ~name:"evm_node_is_ready" + ~name:"is_ready" ~msg:"the EVM node is listening to {addr}:{port}" ~level:Notice ("addr", Data_encoding.string) @@ -49,7 +49,7 @@ module Event = struct let event_retrying_connect = Internal_event.Simple.declare_2 ~section - ~name:"evm_node_retrying_connect" + ~name:"retrying_connect" ~msg:"Cannot connect to {endpoint}, retrying in {delay} seconds.." ~level:Notice ("endpoint", Data_encoding.string) @@ -58,7 +58,7 @@ module Event = struct let event_shutdown_node = Internal_event.Simple.declare_1 ~section - ~name:"evm_node_shutting_down" + ~name:"shutting_down" ~msg:"Stopping the EVM node" ~level:Notice ("exit_status", Data_encoding.int8) @@ -66,7 +66,7 @@ module Event = struct let event_shutdown_tx_pool = Internal_event.Simple.declare_0 ~section - ~name:"evm_node_shutting_down_tx_pool" + ~name:"shutting_down_tx_pool" ~msg:"Stopping the tx-pool" ~level:Notice () @@ -75,7 +75,7 @@ module Event = struct let server = if private_ then "private" else "public" in Internal_event.Simple.declare_0 ~section - ~name:("evm_node_shutting_down_" ^ server ^ "_rpc_server") + ~name:("shutting_down_" ^ server ^ "_rpc_server") ~msg:("Stopping the" ^ server ^ " RPC server") ~level:Notice () @@ -83,7 +83,7 @@ module Event = struct let event_callback_log = Internal_event.Simple.declare_3 ~section - ~name:"evm_node_callback_log" + ~name:"callback_log" ~msg:"Uri: {uri}\nMethod: {method}\nBody: {body}\n" ~level:Notice ("uri", Data_encoding.string) @@ -716,7 +716,16 @@ let sequencer_command = rollup_node_endpoint sequencer () -> - let*! () = Tezos_base_unix.Internal_event_unix.init () in + let*! () = + let open Tezos_base_unix.Internal_event_unix in + let config = + make_with_defaults + ~enable_default_daily_logs_at: + Filename.Infix.(data_dir // "daily_logs") + () + in + init ~config () + in let*! () = Internal_event.Simple.emit Event.event_starting "sequencer" in let* config = Cli.create_or_read_sequencer_config diff --git a/etherlink/tezt/lib/evm_node.ml b/etherlink/tezt/lib/evm_node.ml index 54cd97311d1d493fdb55b7432c335d6870162475..02a73df2b7a05b94ff6985b1567c2357f47bc96f 100644 --- a/etherlink/tezt/lib/evm_node.ml +++ b/etherlink/tezt/lib/evm_node.ml @@ -69,11 +69,6 @@ include Daemon.Make (Parameters) let mode t = t.persistent_state.mode -let devmode t = - match t.persistent_state.mode with - | Observer _ | Sequencer _ -> true - | Proxy {devmode; _} -> devmode - let is_sequencer t = match t.persistent_state.mode with | Sequencer _ -> true @@ -131,29 +126,25 @@ let set_ready evm_node = | Running status -> status.session_state.ready <- true) ; trigger_ready evm_node (Some ()) -let event_ready_name = "evm_node_is_ready.v0" - -let mode_prefix = function true -> "evm_node_dev" | false -> "evm_node_prod" +let event_ready_name = "is_ready.v0" -let event_blueprint_injected_name devmode = - mode_prefix devmode ^ "_blueprint_injection.v0" +let event_blueprint_injected_name = "blueprint_injection.v0" -let event_blueprint_applied_name devmode = - mode_prefix devmode ^ "_blueprint_application.v0" +let event_blueprint_applied_name = "blueprint_application.v0" let handle_is_ready_event (evm_node : t) {name; value = _; timestamp = _} = if name = event_ready_name then set_ready evm_node else () let handle_blueprint_injected_event (evm_node : t) {name; value; timestamp = _} = - if name = event_blueprint_injected_name (devmode evm_node) then + if name = event_blueprint_injected_name then trigger_blueprint_injected evm_node JSON.(value |> as_string |> int_of_string) else () let handle_blueprint_applied_event (evm_node : t) {name; value; timestamp = _} = - if name = event_blueprint_applied_name (devmode evm_node) then + if name = event_blueprint_applied_name then trigger_blueprint_applied evm_node JSON.(value |> as_string |> int_of_string) @@ -206,11 +197,7 @@ let wait_for_blueprint_injected ~timeout evm_node level = level (fun pending -> Some (resolver :: Option.value ~default:[] pending)) evm_node.persistent_state.pending_blueprint_injected ; - check_event - ~timeout - evm_node - (event_blueprint_injected_name (devmode evm_node)) - promise + check_event ~timeout evm_node event_blueprint_injected_name promise | Running {session_state = {ready = true; _}; _} -> failwith "EVM node is not a sequencer" | Not_running | Running {session_state = {ready = false; _}; _} -> @@ -229,11 +216,7 @@ let wait_for_blueprint_applied ~timeout evm_node level = level (fun pending -> Some (resolver :: Option.value ~default:[] pending)) evm_node.persistent_state.pending_blueprint_applied ; - check_event - ~timeout - evm_node - (event_blueprint_applied_name (devmode evm_node)) - promise + check_event ~timeout evm_node event_blueprint_applied_name promise | Running {session_state = {ready = true; _}; _} -> failwith "EVM node cannot produce blueprints" | Not_running | Running {session_state = {ready = false; _}; _} -> diff --git a/etherlink/tezt/tests/evm_rollup.ml b/etherlink/tezt/tests/evm_rollup.ml index 0b9752cb993282f7d20cf4f9c1e94a7ded9faa0c..e262d01904a44f1ffc35f61cf49c042087a91e4c 100644 --- a/etherlink/tezt/tests/evm_rollup.ml +++ b/etherlink/tezt/tests/evm_rollup.ml @@ -4026,8 +4026,7 @@ let test_keep_alive = Evm_node.run ~wait:false ~extra_arguments:["--keep-alive"] evm_node in let* () = - Evm_node.wait_for evm_node "evm_node_retrying_connect.v0" - @@ fun _json -> Some () + Evm_node.wait_for evm_node "retrying_connect.v0" @@ fun _json -> Some () in (* Restart the rollup node to restore the connection. *) let* () = Sc_rollup_node.run sc_rollup_node sc_rollup_address [] in diff --git a/etherlink/tezt/tests/evm_sequencer.ml b/etherlink/tezt/tests/evm_sequencer.ml index 61a1a3bdbccdc0d0e0e36401e3c2095b6105c093..4712d7af03c855fce34754b0fddba693dd65e173 100644 --- a/etherlink/tezt/tests/evm_sequencer.ml +++ b/etherlink/tezt/tests/evm_sequencer.ml @@ -503,13 +503,13 @@ let wait_for_delayed_inbox_add_tx_and_injected ~evm_node ~sc_rollup_node ~node ~client = let event_watcher = let added = - Evm_node.wait_for evm_node "evm_node_dev_delayed_inbox_add_transaction.v0" + Evm_node.wait_for evm_node "delayed_inbox_add_transaction.v0" @@ fun json -> let hash = JSON.(json |-> "hash" |> as_string) in Some hash in let injected = - Evm_node.wait_for evm_node "evm_node_dev_tx_pool_transaction_injected.v0" + Evm_node.wait_for evm_node "tx_pool_transaction_injected.v0" @@ fun json -> let hash = JSON.(json |> as_string) in Some hash @@ -531,8 +531,7 @@ let wait_for_delayed_inbox_add_tx_and_injected ~evm_node ~sc_rollup_node ~node let wait_for_delayed_inbox_fetch ~evm_node ~sc_rollup_node ~node ~client = let event_watcher = - Evm_node.wait_for evm_node "evm_node_dev_delayed_inbox_fetch_succeeded.v0" - @@ fun json -> + Evm_node.wait_for evm_node "delayed_inbox_fetch_succeeded.v0" @@ fun json -> let nb = JSON.(json |-> "nb" |> as_int) in Some nb in