From 7f90c07a680f47d00311af3a2d767f25b4155fe8 Mon Sep 17 00:00:00 2001 From: Dibassi Brahima Date: Thu, 10 Apr 2025 16:24:01 +0200 Subject: [PATCH] EVM/Tezlink: Revert support for Tezos bootstrap accounts --- etherlink/bin_node/lib_dev/encodings/dune | 3 +- .../bin_node/lib_dev/encodings/tezos_types.ml | 25 ---- .../lib_dev/encodings/tezos_types.mli | 14 --- etherlink/bin_node/lib_dev/kernel_config.ml | 70 +++-------- etherlink/bin_node/lib_dev/kernel_config.mli | 12 +- etherlink/bin_node/main.ml | 111 ++++++------------ etherlink/tezt/lib/evm_node.ml | 86 ++++---------- etherlink/tezt/lib/evm_node.mli | 19 +-- etherlink/tezt/lib/setup.ml | 64 ++++------ etherlink/tezt/lib/setup.mli | 12 +- etherlink/tezt/lib/test_helpers.ml | 8 +- etherlink/tezt/lib/test_helpers.mli | 3 +- etherlink/tezt/tests/eth_call.ml | 10 +- etherlink/tezt/tests/evm_rollup.ml | 74 ++++++------ etherlink/tezt/tests/evm_sequencer.ml | 89 +++++--------- .../evm_sequencer.ml/EVM Node- man.out | 49 +++----- manifest/product_etherlink.ml | 31 +++-- opam/octez-evm-node-libs.opam | 2 +- tezt/tests/cloud/dal.ml | 8 +- 19 files changed, 219 insertions(+), 471 deletions(-) diff --git a/etherlink/bin_node/lib_dev/encodings/dune b/etherlink/bin_node/lib_dev/encodings/dune index 7013d6ffb122..1fda77e6749d 100644 --- a/etherlink/bin_node/lib_dev/encodings/dune +++ b/etherlink/bin_node/lib_dev/encodings/dune @@ -10,8 +10,7 @@ octez-smart-rollup-wasm-debugger-plugin octez-evm-node-libs.websocket re - uuidm - octez-protocol-021-PsQuebec-libs.plugin) + uuidm) (flags (:standard) -open Tezos_base.TzPervasives)) diff --git a/etherlink/bin_node/lib_dev/encodings/tezos_types.ml b/etherlink/bin_node/lib_dev/encodings/tezos_types.ml index de3749b5b0c7..6c5403e5e2fc 100644 --- a/etherlink/bin_node/lib_dev/encodings/tezos_types.ml +++ b/etherlink/bin_node/lib_dev/encodings/tezos_types.ml @@ -40,28 +40,3 @@ let block_from_binary bytes = in {number; hash; timestamp; parent_hash = parent}) else raise (Invalid_argument "Expected a string of length 44") - -(* We don't yet support smart contracts so all addresses are implicit accounts. *) -type address = Signature.V1.public_key_hash - -let address_encoding = - Tezos_protocol_021_PsQuebec.Protocol.Alpha_context.Contract.implicit_encoding - -let address_of_b58check = Signature.V1.Public_key_hash.of_b58check - -let address_of_b58exn = Signature.V1.Public_key_hash.of_b58check_exn - -let address_to_hex_exn address = - let raw_key = Data_encoding.Binary.to_bytes_exn address_encoding address in - let (`Hex key) = Hex.of_bytes raw_key in - key - -module Tez = struct - include Tezos_protocol_021_PsQuebec.Protocol.Alpha_context.Tez - - let of_string_exn str = - match of_string str with - | None -> - raise (Invalid_argument (Printf.sprintf "Invalid tez value: %s" str)) - | Some s -> s -end diff --git a/etherlink/bin_node/lib_dev/encodings/tezos_types.mli b/etherlink/bin_node/lib_dev/encodings/tezos_types.mli index 72698b77646e..25a0c2f62add 100644 --- a/etherlink/bin_node/lib_dev/encodings/tezos_types.mli +++ b/etherlink/bin_node/lib_dev/encodings/tezos_types.mli @@ -17,17 +17,3 @@ val decode_block_hash : bytes -> Ethereum_types.block_hash val genesis_parent_hash : Ethereum_types.block_hash val block_from_binary : bytes -> block - -type address = Signature.V1.public_key_hash - -val address_of_b58check : string -> address tzresult - -val address_of_b58exn : string -> address - -val address_to_hex_exn : address -> string - -module Tez : sig - include module type of Tezos_protocol_021_PsQuebec.Protocol.Alpha_context.Tez - - val of_string_exn : string -> t -end diff --git a/etherlink/bin_node/lib_dev/kernel_config.ml b/etherlink/bin_node/lib_dev/kernel_config.ml index 97904ad22867..25e16c2e1783 100644 --- a/etherlink/bin_node/lib_dev/kernel_config.ml +++ b/etherlink/bin_node/lib_dev/kernel_config.ml @@ -82,8 +82,7 @@ let clean_path path = [] (List.rev path) -let make_l2 ~eth_bootstrap_balance ~tez_bootstrap_balance - ?eth_bootstrap_accounts ?tez_bootstrap_accounts ?minimum_base_fee_per_gas +let make_l2 ~boostrap_balance ?bootstrap_accounts ?minimum_base_fee_per_gas ?da_fee_per_byte ?sequencer_pool_address ?maximum_gas_per_transaction ?set_account_code ?world_state_path ~l2_chain_id ~l2_chain_family ~output () = @@ -92,38 +91,18 @@ let make_l2 ~eth_bootstrap_balance ~tez_bootstrap_balance | None -> ["evm"; "world_state"; l2_chain_id] | Some (_, value) -> clean_path (String.split_on_char '/' value) in - let eth_bootstrap_accounts = - match eth_bootstrap_accounts with + let bootstrap_accounts = + match bootstrap_accounts with | None -> [] - | Some eth_bootstrap_accounts -> + | Some bootstrap_accounts -> let open Ethereum_types in - let balance = padded_32_le_int_bytes eth_bootstrap_balance in + let balance = padded_32_le_int_bytes boostrap_balance in List.map (fun (Address (Hex address)) -> make_instr ~path_prefix:(world_state_prefix @ ["eth_accounts"; address]) (Some ("balance", balance))) - eth_bootstrap_accounts - |> List.flatten - in - let tez_bootstrap_accounts = - match tez_bootstrap_accounts with - | None -> [] - | Some tez_bootstrap_accounts -> - let open Tezos_types in - List.map - (fun address -> - make_instr - ~path_prefix: - [ - "tezlink"; - "context"; - "contracts"; - "index"; - address_to_hex_exn address; - ] - (Some ("balance", Tez.to_string tez_bootstrap_balance))) - tez_bootstrap_accounts + bootstrap_accounts |> List.flatten in let set_account_code = @@ -167,12 +146,11 @@ let make_l2 ~eth_bootstrap_balance ~tez_bootstrap_balance Hex.to_bytes_exn (`Hex addr) |> String.of_bytes) ~path_prefix:world_state_prefix sequencer_pool_address - @ eth_bootstrap_accounts @ tez_bootstrap_accounts @ set_account_code + @ bootstrap_accounts @ set_account_code in Installer_config.to_file (config_instrs @ world_state_instrs) ~output -let make ~mainnet_compat ~eth_bootstrap_balance ~tez_bootstrap_balance - ?l2_chain_ids ?eth_bootstrap_accounts ?tez_bootstrap_accounts +let make ~mainnet_compat ~boostrap_balance ?l2_chain_ids ?bootstrap_accounts ?kernel_root_hash ?chain_id ?sequencer ?delayed_bridge ?ticketer ?admin ?sequencer_governance ?kernel_governance ?kernel_security_governance ?minimum_base_fee_per_gas ?da_fee_per_byte ?delayed_inbox_timeout @@ -182,38 +160,18 @@ let make ~mainnet_compat ~eth_bootstrap_balance ~tez_bootstrap_balance ?enable_fast_withdrawal ?enable_fast_fa_withdrawal ?enable_multichain ?set_account_code ?max_delayed_inbox_blueprint_length ?evm_version ~output () = - let eth_bootstrap_accounts = + let bootstrap_accounts = let open Ethereum_types in - match eth_bootstrap_accounts with + match bootstrap_accounts with | None -> [] - | Some eth_bootstrap_accounts -> - let balance = padded_32_le_int_bytes eth_bootstrap_balance in + | Some bootstrap_accounts -> + let balance = padded_32_le_int_bytes boostrap_balance in List.map (fun (Address (Hex address)) -> make_instr ~path_prefix:["evm"; "world_state"; "eth_accounts"; address] (Some ("balance", balance))) - eth_bootstrap_accounts - |> List.flatten - in - let tez_bootstrap_accounts = - match tez_bootstrap_accounts with - | None -> [] - | Some tez_bootstrap_accounts -> - let open Tezos_types in - List.map - (fun address -> - make_instr - ~path_prefix: - [ - "tezlink"; - "context"; - "contracts"; - "index"; - address_to_hex_exn address; - ] - (Some ("balance", Tez.to_string tez_bootstrap_balance))) - tez_bootstrap_accounts + bootstrap_accounts |> List.flatten in let set_account_code = @@ -294,7 +252,7 @@ let make ~mainnet_compat ~eth_bootstrap_balance ~tez_bootstrap_balance @ make_instr ~convert:le_int64_bytes maximum_allowed_ticks @ make_instr ~convert:le_int64_bytes maximum_gas_per_transaction @ make_instr ~convert:le_int64_bytes max_blueprint_lookahead_in_seconds - @ eth_bootstrap_accounts @ tez_bootstrap_accounts @ set_account_code + @ bootstrap_accounts @ set_account_code @ make_instr remove_whitelist @ make_instr ~path_prefix:["evm"; "feature_flags"] enable_fa_bridge @ make_instr ~path_prefix:["evm"; "feature_flags"] enable_dal diff --git a/etherlink/bin_node/lib_dev/kernel_config.mli b/etherlink/bin_node/lib_dev/kernel_config.mli index bfcec2b56983..95bec428cf8c 100644 --- a/etherlink/bin_node/lib_dev/kernel_config.mli +++ b/etherlink/bin_node/lib_dev/kernel_config.mli @@ -13,11 +13,9 @@ type evm_version = Shanghai | Cancun [bootstrap_accounts] are provisioned with [bootstrap_balance]. *) val make : mainnet_compat:bool -> - eth_bootstrap_balance:Ethereum_types.NonceMap.key -> - tez_bootstrap_balance:Tezos_types.Tez.t -> + boostrap_balance:Ethereum_types.NonceMap.key -> ?l2_chain_ids:L2_types.chain_id list -> - ?eth_bootstrap_accounts:Ethereum_types.address list -> - ?tez_bootstrap_accounts:Tezos_types.address list -> + ?bootstrap_accounts:Ethereum_types.address list -> ?kernel_root_hash:string * string -> ?chain_id:string * string -> ?sequencer:string * string -> @@ -53,10 +51,8 @@ val make : generates a configuration file located at [output] for the chain [l2_chain_id], where [bootstrap_accounts] are provisioned with [bootstrap_balance]. *) val make_l2 : - eth_bootstrap_balance:Ethereum_types.NonceMap.key -> - tez_bootstrap_balance:Tezos_types.Tez.t -> - ?eth_bootstrap_accounts:Ethereum_types.address list -> - ?tez_bootstrap_accounts:Tezos_types.address list -> + boostrap_balance:Z.t -> + ?bootstrap_accounts:Ethereum_types.address list -> ?minimum_base_fee_per_gas:string * string -> ?da_fee_per_byte:string * string -> ?sequencer_pool_address:string * string -> diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml index a7eae3e51768..6a3650504530 100644 --- a/etherlink/bin_node/main.ml +++ b/etherlink/bin_node/main.ml @@ -150,7 +150,7 @@ module Params = struct [\"1970-01-01T00:00:00Z\"]) or in number of seconds since \ the {!Time.Protocol.epoch}.")) - let eth_address = + let l2_address = Tezos_clic.parameter (fun _ address -> let open Lwt_result_syntax in let hex = Evm_node_lib_dev.Misc.normalize_addr address in @@ -162,11 +162,6 @@ module Params = struct in return (Evm_node_lib_dev_encoding.Ethereum_types.Address (Hex hex))) - let tez_address = - Tezos_clic.parameter (fun _ address -> - Lwt.return - (Evm_node_lib_dev_encoding.Tezos_types.address_of_b58check address)) - let l2_level = Tezos_clic.parameter (fun () s -> Lwt.return_ok @@ -1408,7 +1403,7 @@ let make_sequencer_upgrade_command = @@ Tezos_clic.param ~name:"pool_address" ~desc:"Pool address of the sequencer" - Params.eth_address + Params.l2_address @@ prefixes ["at"; "activation"; "timestamp"] @@ param ~name:"activation_timestamp" @@ -1883,37 +1878,10 @@ let config_key_flag ~name = if enable then return_some (name, "") else return_none) @@ Tezos_clic.switch ~long ~doc () -let eth_bootstrap_account_arg = - let long = "eth-bootstrap-account" in - let doc = - Format.sprintf "Add an etherlink bootstrap account in the installer config." - in - Tezos_clic.multiple_arg ~long ~doc ~placeholder:"0x..." Params.eth_address - -let tez_bootstrap_account_arg = - let long = "tez-bootstrap-account" in - let doc = - Format.sprintf "Add an tezlink bootstrap account in the installer config." - in - Tezos_clic.multiple_arg ~long ~doc ~placeholder:"tz1..." Params.tez_address - -let eth_bootstrap_balance_arg = - Tezos_clic.default_arg - ~long:"eth-bootstrap-balance" - ~doc:"Balance of the etherlink bootstrap accounts" - ~default:"9999000000000000000000" - ~placeholder:"9999000000000000000000" - @@ Tezos_clic.parameter (fun _ s -> Lwt_result.return @@ Z.of_string s) - -let tez_bootstrap_balance_arg = - Tezos_clic.default_arg - ~long:"tez-bootstrap-balance" - ~doc:"Balance of the tezlink bootstrap accounts" - ~default:"3800000" - ~placeholder:"3800000" - @@ Tezos_clic.parameter (fun _ s -> - Lwt_result.return - @@ Evm_node_lib_dev_encoding.Tezos_types.Tez.of_string_exn s) +let bootstrap_account_arg = + let long = "bootstrap-account" in + let doc = Format.sprintf "Add a bootstrap account in the installer config." in + Tezos_clic.multiple_arg ~long ~doc ~placeholder:"0x..." Params.l2_address let set_account_code = let long = "set-code" in @@ -1948,17 +1916,20 @@ let make_l2_kernel_config_command = ~desc: "Produce a file containing the part of the kernel configuration \ instructions related to a particular L2 chain." - (args12 + (args10 (config_key_arg ~name:"minimum_base_fee_per_gas" ~placeholder:"111...") (config_key_arg ~name:"da_fee_per_byte" ~placeholder:"111...") (config_key_arg ~name:"sequencer_pool_address" ~placeholder:"0x...") (config_key_arg ~name:"maximum_gas_per_transaction" ~placeholder:"30000...") - eth_bootstrap_balance_arg - eth_bootstrap_account_arg - tez_bootstrap_balance_arg - tez_bootstrap_account_arg + (Tezos_clic.default_arg + ~long:"bootstrap-balance" + ~doc:"Balance of the bootstrap accounts." + ~default:"9999000000000000000000" + ~placeholder:"9999000000000000000000" + @@ Tezos_clic.parameter (fun _ s -> return @@ Z.of_string s)) + bootstrap_account_arg set_account_code (config_key_arg ~name:"world_state_path" @@ -1985,10 +1956,8 @@ let make_l2_kernel_config_command = da_fee_per_byte, sequencer_pool_address, maximum_gas_per_transaction, - eth_bootstrap_balance, - eth_bootstrap_accounts, - tez_bootstrap_balance, - tez_bootstrap_accounts, + boostrap_balance, + bootstrap_accounts, set_account_code, world_state_path, l2_chain_id, @@ -2004,14 +1973,12 @@ let make_l2_kernel_config_command = | Some l2_chain_id -> return (Chain_id.to_string l2_chain_id) in Evm_node_lib_dev.Kernel_config.make_l2 - ~eth_bootstrap_balance - ~tez_bootstrap_balance - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?minimum_base_fee_per_gas ?da_fee_per_byte ?sequencer_pool_address ?maximum_gas_per_transaction + ~boostrap_balance + ?bootstrap_accounts ?set_account_code ?world_state_path ~l2_chain_id @@ -2030,6 +1997,7 @@ let l2_chain_ids_arg = let make_kernel_config_command = let open Tezos_clic in + let open Lwt_result_syntax in command ~group:Groups.kernel ~desc:"Create a configuration for the kernel installer." @@ -2064,14 +2032,18 @@ let make_kernel_config_command = ~name:"max_blueprint_lookahead_in_seconds" ~placeholder:"500") (config_key_flag ~name:"remove_whitelist") - eth_bootstrap_balance_arg - eth_bootstrap_account_arg - tez_bootstrap_balance_arg - tez_bootstrap_account_arg + (Tezos_clic.default_arg + ~long:"bootstrap-balance" + ~doc:"Balance of the bootstrap accounts" + ~default:"9999000000000000000000" + ~placeholder:"9999000000000000000000" + @@ Tezos_clic.parameter (fun _ s -> return @@ Z.of_string s)) + bootstrap_account_arg + set_account_code (config_key_flag ~name:"enable_fa_bridge") - (config_key_arg ~name:"dal_slots" ~placeholder:"0,1,4,6,...")) - (args8 (config_key_flag ~name:"enable_dal") + (config_key_arg ~name:"dal_slots" ~placeholder:"0,1,4,6,...")) + (args6 (config_key_flag ~name:"enable_multichain") l2_chain_ids_arg (config_key_arg @@ -2079,8 +2051,7 @@ let make_kernel_config_command = ~placeholder:"1000") (config_key_flag ~name:"enable_fast_withdrawal") (config_key_flag ~name:"enable_fast_fa_withdrawal") - evm_version_arg - set_account_code)) + evm_version_arg)) (prefixes ["make"; "kernel"; "installer"; "config"] @@ param ~name:"kernel config file" @@ -2106,26 +2077,22 @@ let make_kernel_config_command = maximum_gas_per_transaction, max_blueprint_lookahead_in_seconds, remove_whitelist, - eth_bootstrap_balance, - eth_bootstrap_accounts, - tez_bootstrap_balance, - tez_bootstrap_accounts, + boostrap_balance, + bootstrap_accounts, + set_account_code, enable_fa_bridge, + enable_dal, dal_slots ), - ( enable_dal, - enable_multichain, + ( enable_multichain, l2_chain_ids, max_delayed_inbox_blueprint_length, enable_fast_withdrawal, enable_fast_fa_withdrawal, - evm_version, - set_account_code ) ) + evm_version ) ) output () -> Evm_node_lib_dev.Kernel_config.make ~mainnet_compat - ~eth_bootstrap_balance - ~tez_bootstrap_balance ?l2_chain_ids ?kernel_root_hash ?chain_id @@ -2146,8 +2113,8 @@ let make_kernel_config_command = ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?remove_whitelist - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ~boostrap_balance + ?bootstrap_accounts ?enable_fa_bridge ?enable_dal ?dal_slots @@ -2242,7 +2209,7 @@ let fund_arg = "The address of an account to provide with funds in the sandbox (can be \ repeated to fund multiple accounts)." in - Tezos_clic.multiple_arg ~long ~doc ~placeholder:"0x..." Params.eth_address + Tezos_clic.multiple_arg ~long ~doc ~placeholder:"0x..." Params.l2_address let sandbox_config_args = Tezos_clic.args13 diff --git a/etherlink/tezt/lib/evm_node.ml b/etherlink/tezt/lib/evm_node.ml index 9b54b9fb2d06..9b38088696df 100644 --- a/etherlink/tezt/lib/evm_node.ml +++ b/etherlink/tezt/lib/evm_node.ml @@ -34,28 +34,24 @@ type l2_setup = { l2_chain_id : int; l2_chain_family : string; world_state_path : string option; - eth_bootstrap_accounts : string list option; - tez_bootstrap_accounts : Account.key list option; + bootstrap_accounts : string list option; sequencer_pool_address : string option; minimum_base_fee_per_gas : Wei.t option; da_fee_per_byte : Wei.t option; maximum_gas_per_transaction : int64 option; } -let eth_default_bootstrap_accounts = +let default_bootstrap_accounts = List.map (fun account -> account.Eth_account.address) (Array.to_list Eth_account.bootstrap_accounts) -let tez_default_bootstrap_accounts = Array.to_list Account.Bootstrap.keys - let default_l2_setup ~l2_chain_id = { l2_chain_id; l2_chain_family = "EVM"; world_state_path = Some "/evm/world_state"; - eth_bootstrap_accounts = Some eth_default_bootstrap_accounts; - tez_bootstrap_accounts = Some tez_default_bootstrap_accounts; + bootstrap_accounts = Some default_bootstrap_accounts; sequencer_pool_address = None; minimum_base_fee_per_gas = None; da_fee_per_byte = None; @@ -1748,9 +1744,8 @@ let ten_years_in_seconds = 3600 * 24 * 365 * 10 |> Int64.of_int let make_kernel_installer_config ?(l2_chain_ids = []) ?max_delayed_inbox_blueprint_length ?(mainnet_compat = false) - ?(remove_whitelist = false) ?kernel_root_hash ?chain_id - ?eth_bootstrap_balance ?tez_bootstrap_balance ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?sequencer ?delayed_bridge ?ticketer ?administrator + ?(remove_whitelist = false) ?kernel_root_hash ?chain_id ?bootstrap_balance + ?bootstrap_accounts ?sequencer ?delayed_bridge ?ticketer ?administrator ?sequencer_governance ?kernel_governance ?kernel_security_governance ?minimum_base_fee_per_gas ?(da_fee_per_byte = Wei.zero) ?delayed_inbox_timeout ?delayed_inbox_min_levels ?sequencer_pool_address @@ -1835,45 +1830,25 @@ let make_kernel_installer_config ?(l2_chain_ids = []) "dal-slots" (fun l -> String.concat "," (List.map string_of_int l)) dal_slots - @ Cli_arg.optional_arg - "eth-bootstrap-balance" - Wei.to_string - eth_bootstrap_balance - @ Cli_arg.optional_arg - "tez-bootstrap-balance" - Tez.to_string - tez_bootstrap_balance + @ Cli_arg.optional_arg "bootstrap-balance" Wei.to_string bootstrap_balance @ Cli_arg.optional_arg "evm-version" Evm_version.to_string evm_version - @ (match tez_bootstrap_accounts with - | None -> [] - | Some tez_bootstrap_accounts -> - List.flatten - @@ List.map - (fun tez_bootstrap_account -> - [ - "--tez-bootstrap-account"; - tez_bootstrap_account.Account.public_key_hash; - ]) - tez_bootstrap_accounts) @ - match eth_bootstrap_accounts with + match bootstrap_accounts with | None -> [] - | Some eth_bootstrap_accounts -> + | Some bootstrap_accounts -> List.flatten @@ List.map - (fun eth_bootstrap_account -> - ["--eth-bootstrap-account"; eth_bootstrap_account]) - eth_bootstrap_accounts + (fun bootstrap_account -> + ["--bootstrap-account"; bootstrap_account]) + bootstrap_accounts in let process = Process.spawn (Uses.path Constant.octez_evm_node) cmd in Runnable.{value = process; run = Process.check} -let make_l2_kernel_installer_config ?chain_id ?chain_family - ?eth_bootstrap_balance ?tez_bootstrap_balance ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?minimum_base_fee_per_gas - ?(da_fee_per_byte = Wei.zero) ?sequencer_pool_address - ?maximum_gas_per_transaction ?(set_account_code = []) ?world_state_path - ~output () = +let make_l2_kernel_installer_config ?chain_id ?chain_family ?bootstrap_balance + ?bootstrap_accounts ?minimum_base_fee_per_gas ?(da_fee_per_byte = Wei.zero) + ?sequencer_pool_address ?maximum_gas_per_transaction + ?(set_account_code = []) ?world_state_path ~output () = let set_account_code = List.flatten @@ List.map @@ -1900,36 +1875,17 @@ let make_l2_kernel_installer_config ?chain_id ?chain_family "maximum-gas-per-transaction" Int64.to_string maximum_gas_per_transaction - @ Cli_arg.optional_arg - "eth-bootstrap-balance" - Wei.to_string - eth_bootstrap_balance - @ Cli_arg.optional_arg - "tez-bootstrap-balance" - Tez.to_string - tez_bootstrap_balance - @ (match tez_bootstrap_accounts with - | None -> [] - | Some tez_bootstrap_accounts -> - List.flatten - @@ List.map - (fun tez_bootstrap_account -> - [ - "--tez-bootstrap-account"; - tez_bootstrap_account.Account.public_key_hash; - ]) - tez_bootstrap_accounts) + @ Cli_arg.optional_arg "bootstrap-balance" Wei.to_string bootstrap_balance @ - match eth_bootstrap_accounts with + match bootstrap_accounts with | None -> [] - | Some eth_bootstrap_accounts -> + | Some bootstrap_accounts -> List.flatten @@ List.map - (fun eth_bootstrap_account -> - ["--eth-bootstrap-account"; eth_bootstrap_account]) - eth_bootstrap_accounts + (fun bootstrap_account -> + ["--bootstrap-account"; bootstrap_account]) + bootstrap_accounts in - let process = Process.spawn (Uses.path Constant.octez_evm_node) cmd in Runnable.{value = process; run = Process.check} diff --git a/etherlink/tezt/lib/evm_node.mli b/etherlink/tezt/lib/evm_node.mli index afa50925ea58..dc8dbd23f102 100644 --- a/etherlink/tezt/lib/evm_node.mli +++ b/etherlink/tezt/lib/evm_node.mli @@ -33,17 +33,14 @@ type l2_setup = { l2_chain_id : int; l2_chain_family : string; world_state_path : string option; - eth_bootstrap_accounts : string list option; - tez_bootstrap_accounts : Account.key list option; + bootstrap_accounts : string list option; sequencer_pool_address : string option; minimum_base_fee_per_gas : Wei.t option; da_fee_per_byte : Wei.t option; maximum_gas_per_transaction : int64 option; } -val eth_default_bootstrap_accounts : string list - -val tez_default_bootstrap_accounts : Account.key list +val default_bootstrap_accounts : string list val default_l2_setup : l2_chain_id:int -> l2_setup @@ -639,10 +636,8 @@ val wait_termination : t -> unit Lwt.t val make_l2_kernel_installer_config : ?chain_id:int -> ?chain_family:string -> - ?eth_bootstrap_balance:Wei.t -> - ?tez_bootstrap_balance:Tez.t -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_balance:Wei.t -> + ?bootstrap_accounts:string list -> ?minimum_base_fee_per_gas:Wei.t -> ?da_fee_per_byte:Wei.t -> ?sequencer_pool_address:string -> @@ -662,10 +657,8 @@ val make_kernel_installer_config : ?remove_whitelist:bool -> ?kernel_root_hash:string -> ?chain_id:int -> - ?eth_bootstrap_balance:Wei.t -> - ?tez_bootstrap_balance:Tez.t -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_balance:Wei.t -> + ?bootstrap_accounts:string list -> ?sequencer:string -> ?delayed_bridge:string -> ?ticketer:string -> diff --git a/etherlink/tezt/lib/setup.ml b/etherlink/tezt/lib/setup.ml index 24729346271d..6a4720794cc6 100644 --- a/etherlink/tezt/lib/setup.ml +++ b/etherlink/tezt/lib/setup.ml @@ -242,8 +242,7 @@ let run_new_observer_node ?(finalized_view = false) ?(patch_config = Fun.id) let setup_kernel_singlechain ~l1_contracts ?max_delayed_inbox_blueprint_length ~mainnet_compat ?delayed_inbox_timeout ?delayed_inbox_min_levels - ?(eth_bootstrap_accounts = Evm_node.eth_default_bootstrap_accounts) - ?(tez_bootstrap_accounts = Evm_node.tez_default_bootstrap_accounts) + ?(bootstrap_accounts = Evm_node.default_bootstrap_accounts) ?sequencer_pool_address ?da_fee_per_byte ?minimum_base_fee_per_gas ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge @@ -272,8 +271,7 @@ let setup_kernel_singlechain ~l1_contracts ?max_delayed_inbox_blueprint_length ?dal_slots ~enable_multichain:false ?max_blueprint_lookahead_in_seconds - ~eth_bootstrap_accounts - ~tez_bootstrap_accounts + ~bootstrap_accounts ~output:output_config ?evm_version ?enable_fa_bridge @@ -296,8 +294,7 @@ let generate_l2_kernel_config (l2_setup : Evm_node.l2_setup) = ?sequencer_pool_address:l2_setup.sequencer_pool_address ?minimum_base_fee_per_gas:l2_setup.minimum_base_fee_per_gas ?da_fee_per_byte:l2_setup.da_fee_per_byte - ?eth_bootstrap_accounts:l2_setup.eth_bootstrap_accounts - ?tez_bootstrap_accounts:l2_setup.tez_bootstrap_accounts + ?bootstrap_accounts:l2_setup.bootstrap_accounts ?world_state_path:l2_setup.world_state_path ~output:l2_config () @@ -319,8 +316,7 @@ let setup_kernel_multichain ~(l2_setups : Evm_node.l2_setup list) ~l1_contracts da_fee_per_byte, sequencer_pool_address, maximum_gas_per_transaction, - eth_bootstrap_accounts, - tez_bootstrap_accounts ) = + bootstrap_accounts ) = match l2_setups with | [ { @@ -328,25 +324,17 @@ let setup_kernel_multichain ~(l2_setups : Evm_node.l2_setup list) ~l1_contracts da_fee_per_byte; sequencer_pool_address; maximum_gas_per_transaction; + bootstrap_accounts; world_state_path; - eth_bootstrap_accounts; - tez_bootstrap_accounts; _; }; ] -> - let eth_bootstrap_accounts = - (* If `world_state_path` is `/evm/world_state`, it means the bootstrap accounts have already been written to that path. - To avoid duplicating this information in the configuration file — which would unnecessarily bloat the rollup origination - operation and cause an error — we skip including them here. *) - if world_state_path = Some "/evm/world_state" then None - else eth_bootstrap_accounts - in ( minimum_base_fee_per_gas, da_fee_per_byte, sequencer_pool_address, maximum_gas_per_transaction, - eth_bootstrap_accounts, - tez_bootstrap_accounts ) + if world_state_path = Some "/evm/world_state" then None + else bootstrap_accounts ) | _ -> assert false in (* In the kernel, the multichain notion was not introduced yet. *) @@ -380,8 +368,7 @@ let setup_kernel_multichain ~(l2_setups : Evm_node.l2_setup list) ~l1_contracts ?dal_slots ~enable_multichain:true ?max_blueprint_lookahead_in_seconds - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ~output:rollup_config ?enable_fa_bridge ?evm_version @@ -421,8 +408,7 @@ let setup_kernel ~enable_multichain ~l2_chains ~l1_contracts ?enable_fast_fa_withdrawal ?dal_slots ?max_blueprint_lookahead_in_seconds - ?eth_bootstrap_accounts:chain_config.Evm_node.eth_bootstrap_accounts - ?tez_bootstrap_accounts:chain_config.Evm_node.tez_bootstrap_accounts + ?bootstrap_accounts:chain_config.Evm_node.bootstrap_accounts ?enable_fa_bridge ?evm_version ~preimages_dir @@ -685,9 +671,8 @@ let setup_sequencer ?max_delayed_inbox_blueprint_length ?next_wasm_runtime ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks ?commitment_period ?challenge_window - ?(eth_bootstrap_accounts = Evm_node.eth_default_bootstrap_accounts) - ?(tez_bootstrap_accounts = Evm_node.tez_default_bootstrap_accounts) - ?sequencer ?sequencer_pool_address ?kernel ?da_fee ?minimum_base_fee_per_gas + ?(bootstrap_accounts = Evm_node.default_bootstrap_accounts) ?sequencer + ?sequencer_pool_address ?kernel ?da_fee ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?enable_fast_withdrawal ?enable_fast_fa_withdrawal ?threshold_encryption @@ -703,8 +688,7 @@ let setup_sequencer ?max_delayed_inbox_blueprint_length ?next_wasm_runtime { (Evm_node.default_l2_setup ~l2_chain_id:1) with sequencer_pool_address; - eth_bootstrap_accounts = Some eth_bootstrap_accounts; - tez_bootstrap_accounts = Some tez_bootstrap_accounts; + bootstrap_accounts = Some bootstrap_accounts; da_fee_per_byte = da_fee; minimum_base_fee_per_gas; maximum_gas_per_transaction; @@ -761,9 +745,8 @@ let register_multichain_test ~__FILE__ ?max_delayed_inbox_blueprint_length ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?(eth_bootstrap_accounts = Evm_node.eth_default_bootstrap_accounts) - ?(tez_bootstrap_accounts = Evm_node.tez_default_bootstrap_accounts) - ?sequencer ?sequencer_pool_address ~kernel ?da_fee ?minimum_base_fee_per_gas + ?(bootstrap_accounts = Evm_node.default_bootstrap_accounts) ?sequencer + ?sequencer_pool_address ~kernel ?da_fee ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?enable_fast_withdrawal ?enable_fast_fa_withdrawal ?commitment_period @@ -797,8 +780,7 @@ let register_multichain_test ~__FILE__ ?max_delayed_inbox_blueprint_length sequencer_pool_address; minimum_base_fee_per_gas; maximum_gas_per_transaction; - eth_bootstrap_accounts = Some eth_bootstrap_accounts; - tez_bootstrap_accounts = Some tez_bootstrap_accounts; + bootstrap_accounts = Some bootstrap_accounts; }; ] | Some l2_chains -> l2_chains @@ -884,9 +866,8 @@ let register_test ~__FILE__ ?max_delayed_inbox_blueprint_length ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?(eth_bootstrap_accounts = Evm_node.eth_default_bootstrap_accounts) - ?(tez_bootstrap_accounts = Evm_node.tez_default_bootstrap_accounts) - ?sequencer ?sequencer_pool_address ~kernel ?da_fee ?minimum_base_fee_per_gas + ?(bootstrap_accounts = Evm_node.default_bootstrap_accounts) ?sequencer + ?sequencer_pool_address ~kernel ?da_fee ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?enable_fast_withdrawal ?enable_fast_fa_withdrawal ?commitment_period @@ -911,8 +892,7 @@ let register_test ~__FILE__ ?max_delayed_inbox_blueprint_length ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ~eth_bootstrap_accounts - ~tez_bootstrap_accounts + ~bootstrap_accounts ?sequencer ?sequencer_pool_address ~kernel @@ -951,9 +931,8 @@ let register_test_for_kernels ~__FILE__ ?max_delayed_inbox_blueprint_length ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?(eth_bootstrap_accounts = Evm_node.eth_default_bootstrap_accounts) - ?(tez_bootstrap_accounts = Evm_node.tez_default_bootstrap_accounts) - ?sequencer ?sequencer_pool_address ?(kernels = Kernel.all) ?da_fee + ?(bootstrap_accounts = Evm_node.default_bootstrap_accounts) ?sequencer + ?sequencer_pool_address ?(kernels = Kernel.all) ?da_fee ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?rollup_history_mode ?commitment_period ?challenge_window @@ -979,8 +958,7 @@ let register_test_for_kernels ~__FILE__ ?max_delayed_inbox_blueprint_length ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ~eth_bootstrap_accounts - ~tez_bootstrap_accounts + ~bootstrap_accounts ?sequencer ?sequencer_pool_address ~kernel diff --git a/etherlink/tezt/lib/setup.mli b/etherlink/tezt/lib/setup.mli index 03101b81aae5..60c6073ab54d 100644 --- a/etherlink/tezt/lib/setup.mli +++ b/etherlink/tezt/lib/setup.mli @@ -91,8 +91,7 @@ val register_test : ?delayed_inbox_timeout:int -> ?delayed_inbox_min_levels:int -> ?max_number_of_chunks:int -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_accounts:string list -> ?sequencer:Account.key -> ?sequencer_pool_address:string -> kernel:Kernel.t -> @@ -141,8 +140,7 @@ val register_multichain_test : ?delayed_inbox_timeout:int -> ?delayed_inbox_min_levels:int -> ?max_number_of_chunks:int -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_accounts:string list -> ?sequencer:Account.key -> ?sequencer_pool_address:string -> kernel:Kernel.t -> @@ -194,8 +192,7 @@ val register_test_for_kernels : ?delayed_inbox_timeout:int -> ?delayed_inbox_min_levels:int -> ?max_number_of_chunks:int -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_accounts:string list -> ?sequencer:Account.key -> ?sequencer_pool_address:string -> ?kernels:Kernel.t list -> @@ -246,8 +243,7 @@ val setup_sequencer : ?max_number_of_chunks:int -> ?commitment_period:int -> ?challenge_window:int -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_accounts:string list -> ?sequencer:Account.key -> ?sequencer_pool_address:string -> ?kernel:Uses.t -> diff --git a/etherlink/tezt/lib/test_helpers.ml b/etherlink/tezt/lib/test_helpers.ml index 65602710099b..f123bcb227e2 100644 --- a/etherlink/tezt/lib/test_helpers.ml +++ b/etherlink/tezt/lib/test_helpers.ml @@ -425,11 +425,10 @@ let init_sequencer_sandbox ?maximum_gas_per_transaction ?genesis_timestamp ?tx_pool_tx_per_addr_limit ?set_account_code ?da_fee_per_byte ?minimum_base_fee_per_gas ?history_mode ?patch_config ?(kernel = Constant.WASM.evm_kernel) ?evm_version - ?(eth_bootstrap_accounts = + ?(bootstrap_accounts = List.map (fun account -> account.Eth_account.address) - (Array.to_list Eth_account.bootstrap_accounts)) - ?(tez_bootstrap_accounts = Array.to_list Account.Bootstrap.keys) () = + (Array.to_list Eth_account.bootstrap_accounts)) () = let wallet_dir = Temp.dir "wallet" in let output_config = Temp.file "config.yaml" in let preimages_dir = Temp.dir "wasm_2_0_0" in @@ -441,8 +440,7 @@ let init_sequencer_sandbox ?maximum_gas_per_transaction ?genesis_timestamp ?da_fee_per_byte ?minimum_base_fee_per_gas ~output:output_config - ~eth_bootstrap_accounts - ~tez_bootstrap_accounts + ~bootstrap_accounts ?evm_version () in diff --git a/etherlink/tezt/lib/test_helpers.mli b/etherlink/tezt/lib/test_helpers.mli index 091075fba59c..7f75cd7561ab 100644 --- a/etherlink/tezt/lib/test_helpers.mli +++ b/etherlink/tezt/lib/test_helpers.mli @@ -247,8 +247,7 @@ val init_sequencer_sandbox : ?patch_config:(JSON.t -> JSON.t) -> ?kernel:Uses.t -> ?evm_version:Evm_version.t -> - ?eth_bootstrap_accounts:string list -> - ?tez_bootstrap_accounts:Account.key list -> + ?bootstrap_accounts:string list -> unit -> Evm_node.t Lwt.t diff --git a/etherlink/tezt/tests/eth_call.ml b/etherlink/tezt/tests/eth_call.ml index d0bc1e9783e0..a3d0b50107e7 100644 --- a/etherlink/tezt/tests/eth_call.ml +++ b/etherlink/tezt/tests/eth_call.ml @@ -20,16 +20,14 @@ open Setup open Test_helpers -let register ?genesis_timestamp ?eth_bootstrap_accounts ?tez_bootstrap_accounts - ?(kernels = Kernel.all) ?preimages_dir ?maximum_allowed_ticks - ?enable_fa_bridge ?rollup_history_mode ?additional_uses ~title ~tags body - protocols = +let register ?genesis_timestamp ?bootstrap_accounts ?(kernels = Kernel.all) + ?preimages_dir ?maximum_allowed_ticks ?enable_fa_bridge ?rollup_history_mode + ?additional_uses ~title ~tags body protocols = register_test_for_kernels ~__FILE__ ~time_between_blocks:Nothing ?genesis_timestamp - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ~kernels ?preimages_dir ?maximum_allowed_ticks diff --git a/etherlink/tezt/tests/evm_rollup.ml b/etherlink/tezt/tests/evm_rollup.ml index 19f9e25f22ad..51bb6b238d74 100644 --- a/etherlink/tezt/tests/evm_rollup.ml +++ b/etherlink/tezt/tests/evm_rollup.ml @@ -298,11 +298,10 @@ let setup_evm_kernel ?additional_config ?(setup_kernel_root_hash = true) ?(kernel = Kernel.Latest) ?evm_version ?(originator_key = Constant.bootstrap1.public_key_hash) ?(rollup_operator_key = Constant.bootstrap1.public_key_hash) ?chain_id - ?(eth_bootstrap_accounts = + ?(bootstrap_accounts = List.map (fun account -> account.Eth_account.address) (Array.to_list Eth_account.bootstrap_accounts)) - ?(tez_bootstrap_accounts = Array.to_list Account.Bootstrap.keys) ?(with_administrator = true) ?da_fee_per_byte ?minimum_base_fee_per_gas ~admin ?sequencer_admin ?commitment_period ?challenge_window ?timestamp ?tx_pool_timeout_limit ?tx_pool_addr_limit ?tx_pool_tx_per_addr_limit @@ -369,8 +368,7 @@ let setup_evm_kernel ?additional_config ?(setup_kernel_root_hash = true) ~mainnet_compat:false ~remove_whitelist:Option.(is_some whitelist) ?kernel_root_hash - ~eth_bootstrap_accounts - ~tez_bootstrap_accounts + ~bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?ticketer @@ -531,9 +529,9 @@ let setup_evm_kernel ?additional_config ?(setup_kernel_root_hash = true) let register_test ~title ~tags ?(kernels = Kernel.all) ?additional_config ?admin ?(additional_uses = []) ?commitment_period ?challenge_window - ?eth_bootstrap_accounts ?tez_bootstrap_accounts ?whitelist ?da_fee_per_byte - ?minimum_base_fee_per_gas ?rollup_operator_key ?maximum_allowed_ticks - ?maximum_gas_per_transaction ?restricted_rpcs ~setup_mode ~enable_dal + ?bootstrap_accounts ?whitelist ?da_fee_per_byte ?minimum_base_fee_per_gas + ?rollup_operator_key ?maximum_allowed_ticks ?maximum_gas_per_transaction + ?restricted_rpcs ~setup_mode ~enable_dal ?(dal_slots = if enable_dal then Some [4] else None) ~enable_multichain ?websockets ?enable_fast_withdrawal ?evm_version ?enable_tx_queue f protocols = @@ -579,8 +577,7 @@ let register_test ~title ~tags ?(kernels = Kernel.all) ?additional_config ?admin ?whitelist ?commitment_period ?challenge_window - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?rollup_operator_key @@ -603,11 +600,10 @@ let register_test ~title ~tags ?(kernels = Kernel.all) ?additional_config ?admin kernels let register_proxy ~title ~tags ?kernels ?additional_uses ?additional_config - ?admin ?commitment_period ?challenge_window ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas - ?whitelist ?rollup_operator_key ?maximum_allowed_ticks - ?maximum_gas_per_transaction ?restricted_rpcs ?websockets - ?enable_fast_withdrawal ?evm_version f protocols = + ?admin ?commitment_period ?challenge_window ?bootstrap_accounts + ?da_fee_per_byte ?minimum_base_fee_per_gas ?whitelist ?rollup_operator_key + ?maximum_allowed_ticks ?maximum_gas_per_transaction ?restricted_rpcs + ?websockets ?enable_fast_withdrawal ?evm_version f protocols = let register ~enable_dal ~enable_multichain : unit = register_test ~title @@ -618,8 +614,7 @@ let register_proxy ~title ~tags ?kernels ?additional_uses ?additional_config ?admin ?commitment_period ?challenge_window - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?whitelist @@ -643,8 +638,8 @@ let register_proxy ~title ~tags ?kernels ?additional_uses ?additional_config let register_sequencer ?(return_sequencer = false) ~title ~tags ?kernels ?additional_uses ?additional_config ?admin ?commitment_period - ?challenge_window ?eth_bootstrap_accounts ?tez_bootstrap_accounts - ?da_fee_per_byte ?minimum_base_fee_per_gas ?time_between_blocks ?whitelist + ?challenge_window ?bootstrap_accounts ?da_fee_per_byte + ?minimum_base_fee_per_gas ?time_between_blocks ?whitelist ?rollup_operator_key ?maximum_allowed_ticks ?maximum_gas_per_transaction ?restricted_rpcs ?max_blueprints_ahead ?websockets ?evm_version ?genesis_timestamp ?enable_tx_queue f protocols = @@ -658,8 +653,7 @@ let register_sequencer ?(return_sequencer = false) ~title ~tags ?kernels ?admin ?commitment_period ?challenge_window - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?whitelist @@ -690,11 +684,11 @@ let register_sequencer ?(return_sequencer = false) ~title ~tags ?kernels register ~enable_dal:true ~enable_multichain:true let register_both ~title ~tags ?kernels ?additional_uses ?additional_config - ?admin ?commitment_period ?challenge_window ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas - ?time_between_blocks ?whitelist ?rollup_operator_key ?maximum_allowed_ticks - ?maximum_gas_per_transaction ?restricted_rpcs ?max_blueprints_ahead - ?websockets ?evm_version f protocols : unit = + ?admin ?commitment_period ?challenge_window ?bootstrap_accounts + ?da_fee_per_byte ?minimum_base_fee_per_gas ?time_between_blocks ?whitelist + ?rollup_operator_key ?maximum_allowed_ticks ?maximum_gas_per_transaction + ?restricted_rpcs ?max_blueprints_ahead ?websockets ?evm_version f protocols + : unit = register_proxy ~title ~tags @@ -704,8 +698,7 @@ let register_both ~title ~tags ?kernels ?additional_uses ?additional_config ?admin ?commitment_period ?challenge_window - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?whitelist @@ -726,8 +719,7 @@ let register_both ~title ~tags ?kernels ?additional_uses ?additional_config ?admin ?commitment_period ?challenge_window - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?da_fee_per_byte ?minimum_base_fee_per_gas ?time_between_blocks @@ -992,7 +984,7 @@ let test_rpc_getBlockReceipts_aux ?websocket {evm_node; produce_block; _} = let test_rpc_getBlockReceipts = register_both ~time_between_blocks:Nothing - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~tags:["evm"; "rpc"; "get_block_receipts"] ~title:"RPC method eth_getBlockReceipts" ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx @@ -2107,7 +2099,7 @@ let test_simulate = let test_full_blocks = register_proxy - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~tags:["evm"; "full_blocks"] ~title: "Check `eth_getBlockByNumber` with full blocks returns the correct \ @@ -2237,7 +2229,7 @@ let test_inject_100_transactions = register_proxy ~tags:["evm"; "bigger_blocks"] ~title:"Check blocks can contain more than 64 transactions" - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx @@ fun ~protocol:_ ~evm_setup:{evm_node; produce_block; _} -> (* Retrieves all the messages and prepare them for the current rollup. *) @@ -3281,7 +3273,7 @@ let test_rpc_getTransactionByBlockHashAndIndex = ~tags:["evm"; "rpc"; "get_transaction_by"; "block_hash_and_index"] ~title:"RPC method eth_getTransactionByBlockHashAndIndex" ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address @@ fun ~protocol:_ -> test_rpc_getTransactionByBlockArgAndIndex ~by:`Hash let test_rpc_getTransactionByBlockNumberAndIndex = @@ -3289,7 +3281,7 @@ let test_rpc_getTransactionByBlockNumberAndIndex = ~tags:["evm"; "rpc"; "get_transaction_by"; "block_number_and_index"] ~title:"RPC method eth_getTransactionByBlockNumberAndIndex" ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address @@ fun ~protocol:_ -> test_rpc_getTransactionByBlockArgAndIndex ~by:`Number type storage_migration_results = { @@ -3307,12 +3299,12 @@ type storage_migration_results = { on master. - everytime a new path/rpc/object is stored in the kernel, a new sanity check MUST be generated. *) -let gen_kernel_migration_test ~from ~to_ ?eth_bootstrap_accounts ?chain_id +let gen_kernel_migration_test ~from ~to_ ?bootstrap_accounts ?chain_id ?(admin = Constant.bootstrap5) ~scenario_prior ~scenario_after protocol = let* evm_setup = setup_evm_kernel ?chain_id - ?eth_bootstrap_accounts + ?bootstrap_accounts ~da_fee_per_byte:Wei.zero ~minimum_base_fee_per_gas:(Wei.of_string "21000") ~kernel:from @@ -3544,7 +3536,7 @@ let test_cannot_prepayed_leads_to_no_inclusion = ~tags:["evm"; "prepay"; "inclusion"] ~title: "Not being able to prepay a transaction leads to it not being included." - ~eth_bootstrap_accounts:[] + ~bootstrap_accounts:[] ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx (* No bootstrap accounts, so no one has funds. *) @@ fun ~protocol:_ ~evm_setup:{evm_node; _} -> @@ -3844,7 +3836,7 @@ let test_transaction_storage_before_and_after_migration = gen_kernel_migration_test ~from:Ghostnet ~to_:Latest - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~scenario_prior ~scenario_after protocol @@ -3939,7 +3931,7 @@ let test_rpc_getBlockTransactionCountBy = ~title: "RPC methods eth_getBlockTransactionCountByHash and \ eth_getBlockTransactionCountByNumber" - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx @@ fun ~protocol:_ ~evm_setup -> let {produce_block; evm_node; _} = evm_setup in @@ -4535,7 +4527,7 @@ let test_block_hash_regression = genesis timestamp can be found in tezt/lib_tezos/client.ml *) let* {evm_node; _} = setup_evm_kernel - ~eth_bootstrap_accounts: + ~bootstrap_accounts: (List.map (fun account -> account.Eth_account.address) (Array.to_list Eth_account.bootstrap_accounts) @@ -5696,7 +5688,7 @@ let test_reveal_storage = ~admin:None ~additional_config ~force_install_kernel:false - ~eth_bootstrap_accounts:[] + ~bootstrap_accounts:[] protocol in diff --git a/etherlink/tezt/tests/evm_sequencer.ml b/etherlink/tezt/tests/evm_sequencer.ml index 9b19c925003d..cf473523d228 100644 --- a/etherlink/tezt/tests/evm_sequencer.ml +++ b/etherlink/tezt/tests/evm_sequencer.ml @@ -244,13 +244,12 @@ let register_all ?max_delayed_inbox_blueprint_length ?sequencer_rpc_port ?sequencer_private_rpc_port ?genesis_timestamp ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels - ?max_number_of_chunks ?eth_bootstrap_accounts ?tez_bootstrap_accounts - ?sequencer ?sequencer_pool_address ?(kernels = Kernel.all) ?da_fee - ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks - ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds - ?enable_fa_bridge ?rollup_history_mode ?commitment_period ?challenge_window - ?additional_uses ?rpc_server ?websockets ?enable_fast_withdrawal - ?enable_fast_fa_withdrawal ?history_mode + ?max_number_of_chunks ?bootstrap_accounts ?sequencer ?sequencer_pool_address + ?(kernels = Kernel.all) ?da_fee ?minimum_base_fee_per_gas ?preimages_dir + ?maximum_allowed_ticks ?maximum_gas_per_transaction + ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?rollup_history_mode + ?commitment_period ?challenge_window ?additional_uses ?rpc_server + ?websockets ?enable_fast_withdrawal ?enable_fast_fa_withdrawal ?history_mode ?(use_threshold_encryption = default_threshold_encryption_registration) ?(use_dal = default_dal_registration) ?(use_multichain = default_multichain_registration) ?enable_tx_queue @@ -307,8 +306,7 @@ let register_all ?max_delayed_inbox_blueprint_length ?sequencer_rpc_port ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?sequencer ?sequencer_pool_address ~kernels @@ -346,13 +344,12 @@ let register_multichain_all ?max_delayed_inbox_blueprint_length ?sequencer_rpc_port ?sequencer_private_rpc_port ?genesis_timestamp ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout - ?delayed_inbox_min_levels ?max_number_of_chunks ?eth_bootstrap_accounts - ?tez_bootstrap_accounts ?sequencer ?sequencer_pool_address ?da_fee - ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks - ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds - ?enable_fa_bridge ?rollup_history_mode ?commitment_period ?challenge_window - ?additional_uses ?rpc_server ?websockets ?enable_fast_withdrawal - ?history_mode + ?delayed_inbox_min_levels ?max_number_of_chunks ?bootstrap_accounts + ?sequencer ?sequencer_pool_address ?da_fee ?minimum_base_fee_per_gas + ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction + ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?rollup_history_mode + ?commitment_period ?challenge_window ?additional_uses ?rpc_server + ?websockets ?enable_fast_withdrawal ?history_mode ?(use_threshold_encryption = default_threshold_encryption_registration) ?(use_dal = default_dal_registration) ~l2_setups ~title ~tags body protocols = @@ -392,8 +389,7 @@ let register_multichain_all ?max_delayed_inbox_blueprint_length ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?eth_bootstrap_accounts - ?tez_bootstrap_accounts + ?bootstrap_accounts ?sequencer ?sequencer_pool_address ?da_fee @@ -683,7 +679,7 @@ let test_make_l2_kernel_installer_config chain_family = ~chain_id:chain_id_1 ~chain_family ~world_state_path - ~eth_bootstrap_accounts:[address] + ~bootstrap_accounts:[address] ~output:l2_config_1 () in @@ -691,7 +687,7 @@ let test_make_l2_kernel_installer_config chain_family = Evm_node.make_l2_kernel_installer_config ~chain_id:chain_id_2 ~chain_family - ~eth_bootstrap_accounts:[address] + ~bootstrap_accounts:[address] ~output:l2_config_2 () in @@ -5943,7 +5939,7 @@ let test_external_transaction_to_delayed_inbox_fails = register_all ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx ~time_between_blocks:Nothing - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~tags:["evm"; "sequencer"; "delayed_inbox"; "external"] ~title:"Sending an external transaction to the delayed inbox fails" @@ fun {client; sequencer; proxy; sc_rollup_node; _} _protocol -> @@ -5971,7 +5967,7 @@ let test_proxy_node_can_forward_to_evm_endpoint = register_all ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx ~time_between_blocks:Nothing - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~tags:["proxy"; "evm_node_endpoint"] ~title:"Proxy node can forward transactions to another EVM node" @@ fun {sequencer; proxy; sc_rollup_node; client; _} _protocol -> @@ -6910,7 +6906,7 @@ let test_blueprint_is_limited_in_size = ~time_between_blocks:Nothing ~max_number_of_chunks:2 ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~tags:["evm"; "sequencer"; "blueprint"; "limit"] ~title: "Checks the sequencer doesn't produce blueprint bigger than the given \ @@ -6986,7 +6982,7 @@ let test_blueprint_is_limited_in_size = let test_blueprint_limit_with_delayed_inbox = register_all - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~sequencer:Constant.bootstrap1 ~time_between_blocks:Nothing ~max_number_of_chunks:2 @@ -8892,32 +8888,6 @@ let test_multichain_feature_flag = "Multichain feature flag in the durable storage is %L, expected %R" ; unit -let test_tezlink_bootstrap_accounts = - register_tezlink_test - ~tags:["bootstrap_accounts"] - ~title:"Check the tezlink bootstrap accounts are set in storage" - @@ fun {sequencer; _} _protocol -> - let* () = - Lwt_list.iter_p - (fun account -> - let addr = - Evm_node_lib_dev_encoding.Tezos_types.address_of_b58exn - account.Account.public_key_hash - in - let path = - sf - "/tezlink/context/contracts/index/%s/balance" - (Evm_node_lib_dev_encoding.Tezos_types.address_to_hex_exn addr) - in - let*@ balance = Rpc.state_value sequencer path in - Check.(Option.is_some balance = true) - Check.bool - ~error_msg:(sf "Expected to have a value at %s" path) ; - unit) - Evm_node.tez_default_bootstrap_accounts - in - unit - let test_fast_withdrawal_feature_flag = register_all ~tags:["fast_withdrawal"; "feature_flag"] @@ -10227,7 +10197,7 @@ let test_rpc_mode_while_block_are_produced = let test_batch_limit_size_rpc = register_all - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx ~title:"Test batch size limit" ~tags:["rpc"; "batch_limit"] @@ -10368,7 +10338,7 @@ let test_describe_endpoint = let test_relay_restricted_rpcs = register_all - ~eth_bootstrap_accounts:Eth_account.lots_of_address + ~bootstrap_accounts:Eth_account.lots_of_address ~minimum_base_fee_per_gas:base_fee_for_hardcoded_tx ~time_between_blocks:Nothing ~kernels:[Latest] @@ -10694,7 +10664,7 @@ let test_websocket_rpcs = ~tags:["evm"; "rpc"; "websocket"] ~title:"RPC methods over websocket" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -10768,7 +10738,7 @@ let test_websocket_subscription_rpcs_cant_be_called_via_http_requests = ~title: "Check that subscriptions rpcs can't be called via regular http requests" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -10827,7 +10797,7 @@ let test_websocket_newHeads_event = ~tags:["evm"; "rpc"; "websocket"; "new_heads"] ~title:"Check that websocket event `newHeads` is behaving correctly" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -10863,7 +10833,7 @@ let test_websocket_cleanup = ~tags:["evm"; "rpc"; "websocket"; "cleanup"] ~title:"Check that websocket subscriptions are cleaned up on close" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -11140,7 +11110,7 @@ let test_websocket_newPendingTransactions_event = "Check that websocket event `newPendingTransactions` is behaving \ correctly" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -11190,7 +11160,7 @@ let test_websocket_logs_event = ~tags:["evm"; "rpc"; "websocket"; "logs"] ~title:"Check that websocket event `logs` is behaving correctly" ~time_between_blocks:Nothing - ~eth_bootstrap_accounts: + ~bootstrap_accounts: ((Array.to_list Eth_account.bootstrap_accounts |> List.map (fun a -> a.Eth_account.address)) @ Eth_account.lots_of_address) @@ -13234,5 +13204,4 @@ let () = test_tezlink_protocols [Alpha] ; test_tezlink_version [Alpha] ; test_tezlink_constants [Alpha] ; - test_tezlink_produceBlock [Alpha] ; - test_tezlink_bootstrap_accounts [Alpha] + test_tezlink_produceBlock [Alpha] diff --git a/etherlink/tezt/tests/expected/evm_sequencer.ml/EVM Node- man.out b/etherlink/tezt/tests/expected/evm_sequencer.ml/EVM Node- man.out index 85856c80a4ab..a683dea3197c 100644 --- a/etherlink/tezt/tests/expected/evm_sequencer.ml/EVM Node- man.out +++ b/etherlink/tezt/tests/expected/evm_sequencer.ml/EVM Node- man.out @@ -702,13 +702,13 @@ Kernel commands: [--sequencer-pool-address <0x...>] [--maximum-allowed-ticks <11000...>] [--maximum-gas-per-transaction <30000...>] [--max-blueprint-lookahead-in-seconds <500>] [--remove-whitelist] - [--eth-bootstrap-balance <9999000000000000000000>] - [--eth-bootstrap-account <0x...>] [--tez-bootstrap-balance <3800000>] - [--tez-bootstrap-account ] [--enable-fa-bridge] - [--dal-slots <0,1,4,6,...>] [--enable-dal] [--enable-multichain] - [--l2-chain-id <1>] [--max-delayed-inbox-blueprint-length <1000>] + [--bootstrap-balance <9999000000000000000000>] + [--bootstrap-account <0x...>] [--set-code <0x...,0x....>] + [--enable-fa-bridge] [--enable-dal] [--dal-slots <0,1,4,6,...>] + [--enable-multichain] [--l2-chain-id <1>] + [--max-delayed-inbox-blueprint-length <1000>] [--enable-fast-withdrawal] [--enable-fast-fa-withdrawal] - [--evm-version ] [--set-code <0x...,0x....>] + [--evm-version ] Create a configuration for the kernel installer. : File path where the config will be written to. --mainnet-compat: Generate a configuration compatible with the first @@ -744,19 +744,16 @@ Kernel commands: --max-blueprint-lookahead-in-seconds <500>: Value for max_blueprint_lookahead_in_seconds in the installer config. --remove-whitelist: Enable flag remove_whitelist in the installer config. - --eth-bootstrap-balance <9999000000000000000000>: Balance of the - etherlink bootstrap accounts - Defaults to `9999000000000000000000`. - --eth-bootstrap-account <0x...>: Add an etherlink bootstrap account in - the installer config. - --tez-bootstrap-balance <3800000>: Balance of the tezlink bootstrap + --bootstrap-balance <9999000000000000000000>: Balance of the bootstrap accounts - Defaults to `3800000`. - --tez-bootstrap-account : Add an tezlink bootstrap account in the - installer config. + Defaults to `9999000000000000000000`. + --bootstrap-account <0x...>: Add a bootstrap account in the installer + config. + --set-code <0x...,0x....>: Add code to an account in the installer + config. --enable-fa-bridge: Enable flag enable_fa_bridge in the installer config. - --dal-slots <0,1,4,6,...>: Value for dal_slots in the installer config. --enable-dal: Enable flag enable_dal in the installer config. + --dal-slots <0,1,4,6,...>: Value for dal_slots in the installer config. --enable-multichain: Enable flag enable_multichain in the installer config. --l2-chain-id <1>: Specify one of the chain ids in the kernel, can be @@ -769,16 +766,13 @@ Kernel commands: installer config. --evm-version : Value for evm_version in the installer config. - --set-code <0x...,0x....>: Add code to an account in the installer - config. make l2 kernel installer config [--minimum-base-fee-per-gas <111...>] [--da-fee-per-byte <111...>] [--sequencer-pool-address <0x...>] [--maximum-gas-per-transaction <30000...>] - [--eth-bootstrap-balance <9999000000000000000000>] - [--eth-bootstrap-account <0x...>] [--tez-bootstrap-balance <3800000>] - [--tez-bootstrap-account ] [--set-code <0x...,0x....>] + [--bootstrap-balance <9999000000000000000000>] + [--bootstrap-account <0x...>] [--set-code <0x...,0x....>] [--world-state-path >] [--l2-chain-id <1>] [--l2-chain-family ] Produce a file containing the part of the kernel configuration @@ -792,16 +786,11 @@ Kernel commands: installer config. --maximum-gas-per-transaction <30000...>: Value for maximum_gas_per_transaction in the installer config. - --eth-bootstrap-balance <9999000000000000000000>: Balance of the - etherlink bootstrap accounts + --bootstrap-balance <9999000000000000000000>: Balance of the bootstrap + accounts. Defaults to `9999000000000000000000`. - --eth-bootstrap-account <0x...>: Add an etherlink bootstrap account in - the installer config. - --tez-bootstrap-balance <3800000>: Balance of the tezlink bootstrap - accounts - Defaults to `3800000`. - --tez-bootstrap-account : Add an tezlink bootstrap account in the - installer config. + --bootstrap-account <0x...>: Add a bootstrap account in the installer + config. --set-code <0x...,0x....>: Add code to an account in the installer config. --world-state-path >: Value for diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index 6c9d7123fc77..0e9ee87b1dfc 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -23,19 +23,6 @@ include Product (struct let source = ["etherlink"; "src"] @ Product_websocket.product_source end) -let quebec = - List.find (fun proto -> Protocol.short_hash proto = "PsQuebec") Protocol.all - -let tezlink_protocol_plugin = - match Protocol.plugin quebec with - | Some target -> target - | None -> (* unreachable *) assert false - -let tezlink_protocol_parameters = - match Protocol.parameters quebec with - | Some target -> target - | None -> (* unreachable *) assert false - let tezt_etherlink = private_lib "tezt_etherlink" @@ -235,7 +222,6 @@ let evm_node_lib_dev_encoding = websocket; re; uuidm; - tezlink_protocol_plugin; ] let evm_node_config = @@ -255,6 +241,19 @@ 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 + let parameters = + match Protocol.parameters quebec with + | Some target -> target + | None -> (* unreachable *) assert false + in octez_evm_node_lib "evm_node_lib_dev" ~path:"etherlink/bin_node/lib_dev" @@ -294,8 +293,8 @@ let evm_node_lib_dev = supported_installers; wasm_runtime; performance_metrics; - tezlink_protocol_plugin; - tezlink_protocol_parameters; + plugin; + parameters; octez_version; octez_shell_services; ] diff --git a/opam/octez-evm-node-libs.opam b/opam/octez-evm-node-libs.opam index 296734d5ca65..936ce9006061 100644 --- a/opam/octez-evm-node-libs.opam +++ b/opam/octez-evm-node-libs.opam @@ -24,7 +24,6 @@ depends: [ "re" { >= "1.10.0" } "octez-smart-rollup-wasm-debugger-plugin" "uuidm" { >= "0.9.9" } - "octez-protocol-021-PsQuebec-libs" "octez-shell-libs" "dream" { >= "1.0.0~alpha7" } "octez-version" @@ -33,6 +32,7 @@ depends: [ "octez-smart-rollup-wasm-debugger-lib" "tezos-dal-node-services" "octez-performance-metrics" + "octez-protocol-021-PsQuebec-libs" "tezos-protocol-021-PsQuebec" ] conflicts: [ diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml index 2b41d7ba31c0..04dd0c9bdf27 100644 --- a/tezt/tests/cloud/dal.ml +++ b/tezt/tests/cloud/dal.ml @@ -2709,7 +2709,7 @@ let init_etherlink_operator_setup cloud configuration etherlink_configuration (* A configuration is generated locally by the orchestrator. The resulting kernel will be pushed to Etherlink. *) let output_config = Temp.file "config.yaml" in - let eth_bootstrap_accounts = + let bootstrap_accounts = Tezt_etherlink.Eth_account.bootstrap_accounts |> Array.to_list |> List.map (fun account -> account.Tezt_etherlink.Eth_account.address) in @@ -2718,7 +2718,7 @@ let init_etherlink_operator_setup cloud configuration etherlink_configuration let () = toplog "Init Etherlink: configuring the kernel" in Tezt_etherlink.Evm_node.make_kernel_installer_config ?sequencer - ~eth_bootstrap_accounts + ~bootstrap_accounts ~output:output_config ~enable_dal:(Option.is_some dal_slots) ?chain_id:etherlink_configuration.chain_id @@ -2879,7 +2879,7 @@ let init_etherlink_producer_setup operator name ~bootstrap ~rpc_external cloud (* A configuration is generated locally by the orchestrator. The resulting kernel will be pushed to Etherlink. *) let output_config = Temp.file "config.yaml" in - let eth_bootstrap_accounts = + let bootstrap_accounts = Tezt_etherlink.Eth_account.bootstrap_accounts |> Array.to_list |> List.map (fun account -> account.Tezt_etherlink.Eth_account.address) in @@ -2889,7 +2889,7 @@ let init_etherlink_producer_setup operator name ~bootstrap ~rpc_external cloud in Tezt_etherlink.Evm_node.make_kernel_installer_config ?sequencer - ~eth_bootstrap_accounts + ~bootstrap_accounts ~output:output_config () in -- GitLab