diff --git a/docs/alpha/smart_rollups.rst b/docs/alpha/smart_rollups.rst index 807e28c5616b0accd5d10c93430df69acd40955d..9e64ddfb4c39f0e2b68aed67165fc9811957a0b5 100644 --- a/docs/alpha/smart_rollups.rst +++ b/docs/alpha/smart_rollups.rst @@ -417,7 +417,7 @@ This creates a configuration file: :: - Smart-contract rollup node configuration written in ${ROLLUP_NODE_DIR}/config.json + Smart rollup node configuration written in ${ROLLUP_NODE_DIR}/config.json Here is the content of the file: @@ -425,8 +425,8 @@ Here is the content of the file: { "data-dir": "${ROLLUP_NODE_DIR}", - "sc-rollup-address": "${SOR_ADDR}", - "sc-rollup-node-operator": { + "smart-rollup-address": "${SOR_ADDR}", + "smart-rollup-node-operator": { "publish": "${OPERATOR_ADDR}", "add_messages": "${OPERATOR_ADDR}", "cement": "${OPERATOR_ADDR}", diff --git a/src/bin_dal_node/configuration.ml b/src/bin_dal_node/configuration.ml index 0dfcf2d6f899a48ac7e6d30d75e096d9a5a390e4..0dc355166beb1de3ee8579014f06b496d1a1853c 100644 --- a/src/bin_dal_node/configuration.ml +++ b/src/bin_dal_node/configuration.ml @@ -60,7 +60,7 @@ let default_dac_addresses = [] let default_reveal_data_dir = Filename.concat - (Filename.concat (Sys.getenv "HOME") ".tezos-sc-rollup-node") + (Filename.concat (Sys.getenv "HOME") ".tezos-smart-rollup-node") "wasm_2_0_0" let default_dac = diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli b/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli index 6413f745b5006dc2469151cb015c254c089a6717..6158c98bd04a9ba93f9766f56db7724855290788 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -(** [all ()] is the list of commands recognized by the smart-contract +(** [all ()] is the list of commands recognized by the smart rollup client. These commands may depend on the client configuration. *) val all : unit -> Configuration.sc_client_context Tezos_clic.command list diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml b/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml index 84d92b06717af7644d28a4a29aeddc747e9236e9..88b7e0157b2af2645d351ff5f42670f1e44385a9 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml @@ -65,9 +65,8 @@ let base_dir_arg () = ~placeholder:"path" ~doc: (Format.asprintf - "@[@[<2>Tezos smart-contract rollup client data directory@,\ - The directory where the Tezos smart-contract rollup client stores \ - its data.@,\ + "@[@[<2>Tezos smart rollup client data directory@,\ + The directory where the Tezos smart rollup client stores its data.@,\ If absent, its value defaults to %s@]@]@." default_base_dir) (Tezos_clic.parameter valid_base_dir) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli b/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli index 2ae505153074315f6de65748412a68ca928b2d0e..56028f3da1439b653868644d57e7a5a0a7c593ec 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli @@ -28,7 +28,7 @@ type t = private { base_dir : string; (** [base_dir] is a directory where client user data is stored. *) endpoint : Uri.t; - (** [endpoint] is used to communicate with the smart-contract rollup + (** [endpoint] is used to communicate with the smart rollup node. *) } diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml index 0b706c624e778dbc0734873fb34164ce2c3fb1ee..1f8e2c05e6a60c9de1fbbe43efd78350790c1e66 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml @@ -35,7 +35,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_commitment_publisher_starting" - ~msg:"Starting commitment publisher for the smart contract rollup node" + ~msg:"Starting commitment publisher for the smart rollup node" ~level:Notice () @@ -43,7 +43,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_commitment_publisher_stopping" - ~msg:"Stopping commitment publisher for the smart contract rollup node" + ~msg:"Stopping commitment publisher for the smart rollup node" ~level:Notice () diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml index aa6ae6f2a6df5aa0848b0868caf90686a0e22c9c..7633c08ee4d158fda03f3db0c63bfc95bae7b640 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml @@ -67,7 +67,7 @@ type t = { } let default_data_dir = - Filename.concat (Sys.getenv "HOME") ".tezos-sc-rollup-node" + Filename.concat (Sys.getenv "HOME") ".tezos-smart-rollup-node" let storage_dir = "storage" @@ -535,14 +535,13 @@ let encoding : t Data_encoding.t = (merge_objs (obj9 (req - "sc-rollup-address" - ~description:"Smart contract rollup address" + "smart-rollup-address" + ~description:"Smart rollup address" Protocol.Alpha_context.Sc_rollup.Address.encoding) (req - "sc-rollup-node-operator" + "smart-rollup-node-operator" ~description: - "Operators that sign operations of the smart contract rollup, \ - by purpose" + "Operators that sign operations of the smart rollup, by purpose" operators_encoding) (dft "rpc-addr" ~description:"RPC address" string default_rpc_addr) (dft "rpc-port" ~description:"RPC port" int16 default_rpc_port) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli b/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli index 36407b9ba7967d0e26900caec63ddbbb544b5351..6f6004363c7a8711995964b7500b7cce22fb43b5 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli @@ -27,7 +27,7 @@ open Protocol open Alpha_context (** This module defines functions that emit the events used by the smart - contract rollup node daemon (see {!Daemon}). *) + rollup node daemon (see {!Daemon}). *) (** [head_processing hash level ~finalized] emits the event that the block of the given [hash] and at the given [level] is being processed, and diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml index 61a9cc437d08f414105a1a4cf83f3b70844d32b2..5817ef32bf1dab3fc3521ca6d1f46ee88fd5ac63 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml @@ -26,29 +26,29 @@ module Simple = struct include Internal_event.Simple - let section = ["sc_rollup_node"] + let section = ["smart_rollup_node"] let starting_node = declare_0 ~section - ~name:"starting_sc_rollup_node" - ~msg:"Starting the smart contract rollup node" + ~name:"starting_smart_rollup_node" + ~msg:"Starting the smart rollup node" ~level:Notice () let shutdown_node = declare_1 ~section - ~name:"stopping_sc_rollup_node" - ~msg:"Stopping the smart contract rollup node" + ~name:"stopping_smart_rollup_node" + ~msg:"Stopping the smart rollup node" ~level:Notice ("exit_status", Data_encoding.int8) let node_is_ready = declare_2 ~section - ~name:"sc_rollup_node_is_ready" - ~msg:"The smart contract rollup node is listening to {addr}:{port}" + ~name:"smart_rollup_node_is_ready" + ~msg:"The smart rollup node is listening to {addr}:{port}" ~level:Notice ("addr", Data_encoding.string) ("port", Data_encoding.uint16) @@ -56,10 +56,9 @@ module Simple = struct let rollup_exists = declare_2 ~section - ~name:"sc_rollup_node_knows_its_rollup" + ~name:"smart_rollup_node_knows_its_rollup" ~msg: - "The smart contract rollup node is interacting with rollup {addr} of \ - kind {kind}" + "The smart rollup node is interacting with rollup {addr} of kind {kind}" ~level:Notice ("addr", Protocol.Alpha_context.Sc_rollup.Address.encoding) ("kind", Data_encoding.string) @@ -67,7 +66,7 @@ module Simple = struct let connection_lost = declare_0 ~section - ~name:"sc_rollup_daemon_connection_lost" + ~name:"smart_rollup_daemon_connection_lost" ~msg:"connection to the node has been lost" ~level:Warning () @@ -75,7 +74,7 @@ module Simple = struct let cannot_connect = declare_2 ~section - ~name:"sc_rollup_daemon_cannot_connect" + ~name:"smart_rollup_daemon_cannot_connect" ~msg:"cannot connect to Tezos node ({count}) {error}" ~level:Warning ("count", Data_encoding.int31) @@ -85,7 +84,7 @@ module Simple = struct let wait_reconnect = declare_1 ~section - ~name:"sc_rollup_daemon_wait_reconnect" + ~name:"smart_rollup_daemon_wait_reconnect" ~msg:"Retrying to connect in {delay}s" ~level:Warning ("delay", Data_encoding.float) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli b/src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli index 6496f9094b4e777ae52225a78d268b3bb4589332..c9cf18106e5d982864e4710f9b9b6d07564e74e4 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli @@ -24,7 +24,7 @@ (*****************************************************************************) (** This module defines functions that emit the events used when the smart - contract rollup node is running (see {!Daemon}). *) + rollup node is running (see {!Daemon}). *) open Protocol.Alpha_context @@ -32,12 +32,12 @@ val starting_node : unit -> unit Lwt.t val node_is_ready : rpc_addr:string -> rpc_port:int -> unit Lwt.t -(** [rollup_exists addr kind] emits the event that the smart contract rollup +(** [rollup_exists addr kind] emits the event that the smart rollup node is interacting with the rollup at address [addr] and of the given [kind]. *) val rollup_exists : addr:Sc_rollup.t -> kind:Sc_rollup.Kind.t -> unit Lwt.t -(** [shutdown_node exit_status] emits the event that the smart contract rollup +(** [shutdown_node exit_status] emits the event that the smart rollup node is stopping with exit status [exit_status]. *) val shutdown_node : int -> unit Lwt.t diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml index 96ca1e6a139493ed6e18e7756b4b090cf05bb8fe..b3e57760ef6b40cf88e0a51a23de423b38f1d2d5 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml @@ -32,7 +32,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_inbox_starting" - ~msg:"Starting inbox tracker of the smart contract rollup node" + ~msg:"Starting inbox tracker of the smart rollup node" ~level:Notice () @@ -40,7 +40,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_inbox_stopping" - ~msg:"Stopping inbox tracker of the smart contract rollup node" + ~msg:"Stopping inbox tracker of the smart rollup node" ~level:Notice () diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml index f8e2dd1edbb9d12bcfdc5f19c40520874be2a989..31aae66ddb528f96e9113f2a5641806f8f90b307 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml @@ -32,7 +32,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_layer_1_starting" - ~msg:"Starting layer 1 tracker of the smart contract rollup node" + ~msg:"Starting layer 1 tracker of the smart rollup node" ~level:Notice () @@ -40,7 +40,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_layer_1_stopping" - ~msg:"Stopping layer 1 tracker of the smart contract rollup node" + ~msg:"Stopping layer 1 tracker of the smart rollup node" ~level:Notice () diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.ml index 86cbb3a6a06c0af7e35863a0447281a39fb0d8c7..c058fcf46b0b00d7f80ad3c1816a14da098423ac 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.ml @@ -26,11 +26,11 @@ let sc_rollup_address_param = Tezos_clic.param - ~name:"sc-rollup-address" - ~desc:"The smart-contract rollup address" + ~name:"smart-rollup-address" + ~desc:"The smart rollup address" (Tezos_clic.parameter (fun _ s -> match Protocol.Alpha_context.Sc_rollup.Address.of_b58check_opt s with - | None -> failwith "Invalid smart-contract rollup address" + | None -> failwith "Invalid smart rollup address" | Some addr -> return addr)) let sc_rollup_node_operator_param = @@ -39,10 +39,10 @@ let sc_rollup_node_operator_param = ~name:"operator" ~desc: (Printf.sprintf - "Public key hash, or alias, of a smart-contract rollup node operator. \ - An operator can be specialized to a particular purpose by prefixing \ - its key or alias by said purpose, e.g. publish:alias_of_my_operator. \ - The possible purposes are: %s." + "Public key hash, or alias, of a smart rollup node operator. An \ + operator can be specialized to a particular purpose by prefixing its \ + key or alias by said purpose, e.g. publish:alias_of_my_operator. The \ + possible purposes are: %s." (String.concat ", " @@ Configuration.(List.map string_of_purpose purposes))) @@ Tezos_clic.parameter @@ -105,8 +105,7 @@ let rpc_addr_arg = ~placeholder:"rpc-address|ip" ~doc: (Format.sprintf - "The address the smart-contract rollup node listens to. Default value \ - is %s" + "The address the smart rollup node listens to. Default value is %s" default) Client_proto_args.string_parameter @@ -115,7 +114,7 @@ let metrics_addr_arg = ~long:"metrics-addr" ~placeholder: "ADDR:PORT or :PORT (by default ADDR is localhost and PORT is 9932)" - ~doc:"The address of the smart-contract rollup node metrics server." + ~doc:"The address of the smart rollup node metrics server." Client_proto_args.string_parameter let dal_node_addr_arg = @@ -125,8 +124,8 @@ let dal_node_addr_arg = ~placeholder:"dal-node-address|ip" ~doc: (Format.sprintf - "The address of the dal node from which the smart-contract rollup \ - node downloads slots. Default value is %s" + "The address of the dal node from which the smart rollup node \ + downloads slots. Default value is %s" default) Client_proto_args.string_parameter @@ -137,8 +136,7 @@ let rpc_port_arg = ~placeholder:"rpc-port" ~doc: (Format.sprintf - "The port the smart-contract rollup node listens to. Default value is \ - %s" + "The port the smart rollup node listens to. Default value is %s" default) Client_proto_args.int_parameter @@ -149,8 +147,8 @@ let dal_node_port_arg = ~placeholder:"dal-node-port" ~doc: (Format.sprintf - "The port of the dal node from which the smart-contract rollup node \ - downloads slots from. Default value is %s" + "The port of the dal node from which the smart rollup node downloads \ + slots from. Default value is %s" default) Client_proto_args.int_parameter @@ -161,8 +159,7 @@ let data_dir_arg = ~placeholder:"data-dir" ~doc: (Format.sprintf - "The path to the smart-contract rollup node data directory. Default \ - value is %s" + "The path to the smart rollup node data directory. Default value is %s" default) ~default Client_proto_args.string_parameter @@ -222,7 +219,7 @@ let injector_retention_period_arg = let group = { Tezos_clic.name = "sc_rollup.node"; - title = "Commands related to the smart-contract rollup node."; + title = "Commands related to the smart rollup node."; } let config_init_command = @@ -230,7 +227,7 @@ let config_init_command = let open Tezos_clic in command ~group - ~desc:"Configure the smart-contract rollup node." + ~desc:"Configure the smart rollup node." (args9 data_dir_arg rpc_addr_arg @@ -302,7 +299,7 @@ let config_init_command = let* () = save ~data_dir config in let*! () = cctxt#message - "Smart-contract rollup node configuration written in %s" + "Smart rollup node configuration written in %s" (config_filename ~data_dir) in return_unit) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli b/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli index 08cf5d4e09ed8368c6c6a6ef03192a1c96e4babb..2e5ed5bd3c4009ba035f5a336435e9a63f1358b5 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli @@ -36,18 +36,17 @@ type 'a t = { data_dir : string; (** Node data dir. *) l1_ctxt : Layer1.t; (** Layer 1 context to fetch blocks and monitor heads, etc.*) - rollup_address : Sc_rollup.t; - (** Smart contract rollup tracked by the rollup node. *) + rollup_address : Sc_rollup.t; (** Smart rollup tracked by the rollup node. *) operators : Configuration.operators; (** Addresses of the rollup node operators by purposes. *) genesis_info : Sc_rollup.Commitment.genesis_info; - (** Origination information of the smart contract rollup. *) + (** Origination information of the smart rollup. *) injector_retention_period : int; (** Number of blocks the injector will keep information about included operations. *) block_finality_time : int; (** Deterministic block finality time for the layer 1 protocol. *) - kind : Sc_rollup.Kind.t; (** Kind of the smart contract rollup. *) + kind : Sc_rollup.Kind.t; (** Kind of the smart rollup. *) fee_parameters : Configuration.fee_parameters; (** Fee parameters to use when injecting operations in layer 1. *) protocol_constants : Constants.t; diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml b/src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml index d4b49002017d970558277aeebd06e740b3a876be..2d615f718c4dd1205aecc397a064f2969e1e62ad 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml @@ -31,7 +31,7 @@ include Store_utils open Alpha_context module IStore = Irmin_store.Make (struct - let name = "Tezos smart-contract rollup node" + let name = "Tezos smart rollup node" end) include Store_utils.Make (IStore) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/l2_message.ml b/src/proto_016_PtMumbai/lib_sc_rollup/l2_message.ml index 71987dc50b8dfbfd6dc0a91d3c7916e3fedac529..cdf5f672edad9b25e3c5be261cb27dab238a933c 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup/l2_message.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup/l2_message.ml @@ -32,7 +32,7 @@ type t = { let content_encoding = let open Data_encoding in - def "sc_l2_message" ~description:"A hex encoded smart contact rollup message" + def "sc_l2_message" ~description:"A hex encoded smart rollup message" @@ string' Hex let encoding = @@ -57,7 +57,7 @@ module Hash = (struct let name = "sc_rollup_l2_message" - let title = "A SCORU L2 message" + let title = "A smart rollup layer 2 message" let b58check_prefix = "\003\250\179\247\196" (* scmsg(55) *) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/sc_rollup_services.ml b/src/proto_016_PtMumbai/lib_sc_rollup/sc_rollup_services.ml index ad563962fe176f0932554e473576fcc55658366a..e6886c48a873c65ca92909283027e64051ff7ea1 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup/sc_rollup_services.ml +++ b/src/proto_016_PtMumbai/lib_sc_rollup/sc_rollup_services.ml @@ -308,21 +308,21 @@ module Global = struct let sc_rollup_address = Tezos_rpc.Service.get_service - ~description:"Smart-contract rollup address" + ~description:"Smart rollup address" ~query:Tezos_rpc.Query.empty ~output:Sc_rollup.Address.encoding - (path / "sc_rollup_address") + (path / "smart_rollup_address") let current_tezos_head = Tezos_rpc.Service.get_service - ~description:"Tezos head known to the smart-contract rollup node" + ~description:"Tezos head known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:(Data_encoding.option Tezos_crypto.Block_hash.encoding) (path / "tezos_head") let current_tezos_level = Tezos_rpc.Service.get_service - ~description:"Tezos level known to the smart-contract rollup node" + ~description:"Tezos level known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:(Data_encoding.option Data_encoding.int32) (path / "tezos_level") @@ -404,16 +404,14 @@ module Global = struct let hash = Tezos_rpc.Service.get_service - ~description: - "Tezos block hash of block known to the smart-contract rollup node" + ~description:"Tezos block hash of block known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:Tezos_crypto.Block_hash.encoding (path / "hash") let level = Tezos_rpc.Service.get_service - ~description: - "Level of Tezos block known to the smart-contract rollup node" + ~description:"Level of Tezos block known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:Data_encoding.int32 (path / "level") diff --git a/src/proto_alpha/bin_sc_rollup_client/commands.mli b/src/proto_alpha/bin_sc_rollup_client/commands.mli index 6413f745b5006dc2469151cb015c254c089a6717..6158c98bd04a9ba93f9766f56db7724855290788 100644 --- a/src/proto_alpha/bin_sc_rollup_client/commands.mli +++ b/src/proto_alpha/bin_sc_rollup_client/commands.mli @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -(** [all ()] is the list of commands recognized by the smart-contract +(** [all ()] is the list of commands recognized by the smart rollup client. These commands may depend on the client configuration. *) val all : unit -> Configuration.sc_client_context Tezos_clic.command list diff --git a/src/proto_alpha/bin_sc_rollup_client/configuration.ml b/src/proto_alpha/bin_sc_rollup_client/configuration.ml index 84d92b06717af7644d28a4a29aeddc747e9236e9..556750448844159ede5078025555fb84f081c32f 100644 --- a/src/proto_alpha/bin_sc_rollup_client/configuration.ml +++ b/src/proto_alpha/bin_sc_rollup_client/configuration.ml @@ -29,7 +29,7 @@ module Base = Tezos_client_base type t = {base_dir : string; endpoint : Uri.t} let default_base_dir = - Filename.concat (Sys.getenv "HOME") ".tezos-sc-rollup-client" + Filename.concat (Sys.getenv "HOME") ".tezos-smart-rollup-client" let default_endpoint = "http://localhost:8932" @@ -65,9 +65,8 @@ let base_dir_arg () = ~placeholder:"path" ~doc: (Format.asprintf - "@[@[<2>Tezos smart-contract rollup client data directory@,\ - The directory where the Tezos smart-contract rollup client stores \ - its data.@,\ + "@[@[<2>Tezos smart rollup client data directory@,\ + The directory where the Tezos smart rollup client stores its data.@,\ If absent, its value defaults to %s@]@]@." default_base_dir) (Tezos_clic.parameter valid_base_dir) diff --git a/src/proto_alpha/bin_sc_rollup_client/configuration.mli b/src/proto_alpha/bin_sc_rollup_client/configuration.mli index 2ae505153074315f6de65748412a68ca928b2d0e..56028f3da1439b653868644d57e7a5a0a7c593ec 100644 --- a/src/proto_alpha/bin_sc_rollup_client/configuration.mli +++ b/src/proto_alpha/bin_sc_rollup_client/configuration.mli @@ -28,7 +28,7 @@ type t = private { base_dir : string; (** [base_dir] is a directory where client user data is stored. *) endpoint : Uri.t; - (** [endpoint] is used to communicate with the smart-contract rollup + (** [endpoint] is used to communicate with the smart rollup node. *) } diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment_event.ml b/src/proto_alpha/bin_sc_rollup_node/commitment_event.ml index 0b706c624e778dbc0734873fb34164ce2c3fb1ee..1f8e2c05e6a60c9de1fbbe43efd78350790c1e66 100644 --- a/src/proto_alpha/bin_sc_rollup_node/commitment_event.ml +++ b/src/proto_alpha/bin_sc_rollup_node/commitment_event.ml @@ -35,7 +35,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_commitment_publisher_starting" - ~msg:"Starting commitment publisher for the smart contract rollup node" + ~msg:"Starting commitment publisher for the smart rollup node" ~level:Notice () @@ -43,7 +43,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_commitment_publisher_stopping" - ~msg:"Stopping commitment publisher for the smart contract rollup node" + ~msg:"Stopping commitment publisher for the smart rollup node" ~level:Notice () diff --git a/src/proto_alpha/bin_sc_rollup_node/configuration.ml b/src/proto_alpha/bin_sc_rollup_node/configuration.ml index 9b66c28f017f149b23485e19fbca1dfb65b919e2..8444a987b87c44152bcdb8c10a5ca0a01c905ce5 100644 --- a/src/proto_alpha/bin_sc_rollup_node/configuration.ml +++ b/src/proto_alpha/bin_sc_rollup_node/configuration.ml @@ -67,7 +67,7 @@ type t = { } let default_data_dir = - Filename.concat (Sys.getenv "HOME") ".tezos-sc-rollup-node" + Filename.concat (Sys.getenv "HOME") ".tezos-smart-rollup-node" let storage_dir = "storage" @@ -535,14 +535,13 @@ let encoding : t Data_encoding.t = (merge_objs (obj9 (req - "sc-rollup-address" - ~description:"Smart contract rollup address" + "smart-rollup-address" + ~description:"Smart rollup address" Protocol.Alpha_context.Sc_rollup.Address.encoding) (req - "sc-rollup-node-operator" + "smart-rollup-node-operator" ~description: - "Operators that sign operations of the smart contract rollup, \ - by purpose" + "Operators that sign operations of the smart rollup, by purpose" operators_encoding) (dft "rpc-addr" ~description:"RPC address" string default_rpc_addr) (dft "rpc-port" ~description:"RPC port" int16 default_rpc_port) diff --git a/src/proto_alpha/bin_sc_rollup_node/daemon_event.mli b/src/proto_alpha/bin_sc_rollup_node/daemon_event.mli index 36407b9ba7967d0e26900caec63ddbbb544b5351..6f6004363c7a8711995964b7500b7cce22fb43b5 100644 --- a/src/proto_alpha/bin_sc_rollup_node/daemon_event.mli +++ b/src/proto_alpha/bin_sc_rollup_node/daemon_event.mli @@ -27,7 +27,7 @@ open Protocol open Alpha_context (** This module defines functions that emit the events used by the smart - contract rollup node daemon (see {!Daemon}). *) + rollup node daemon (see {!Daemon}). *) (** [head_processing hash level ~finalized] emits the event that the block of the given [hash] and at the given [level] is being processed, and diff --git a/src/proto_alpha/bin_sc_rollup_node/event.ml b/src/proto_alpha/bin_sc_rollup_node/event.ml index 61a9cc437d08f414105a1a4cf83f3b70844d32b2..5817ef32bf1dab3fc3521ca6d1f46ee88fd5ac63 100644 --- a/src/proto_alpha/bin_sc_rollup_node/event.ml +++ b/src/proto_alpha/bin_sc_rollup_node/event.ml @@ -26,29 +26,29 @@ module Simple = struct include Internal_event.Simple - let section = ["sc_rollup_node"] + let section = ["smart_rollup_node"] let starting_node = declare_0 ~section - ~name:"starting_sc_rollup_node" - ~msg:"Starting the smart contract rollup node" + ~name:"starting_smart_rollup_node" + ~msg:"Starting the smart rollup node" ~level:Notice () let shutdown_node = declare_1 ~section - ~name:"stopping_sc_rollup_node" - ~msg:"Stopping the smart contract rollup node" + ~name:"stopping_smart_rollup_node" + ~msg:"Stopping the smart rollup node" ~level:Notice ("exit_status", Data_encoding.int8) let node_is_ready = declare_2 ~section - ~name:"sc_rollup_node_is_ready" - ~msg:"The smart contract rollup node is listening to {addr}:{port}" + ~name:"smart_rollup_node_is_ready" + ~msg:"The smart rollup node is listening to {addr}:{port}" ~level:Notice ("addr", Data_encoding.string) ("port", Data_encoding.uint16) @@ -56,10 +56,9 @@ module Simple = struct let rollup_exists = declare_2 ~section - ~name:"sc_rollup_node_knows_its_rollup" + ~name:"smart_rollup_node_knows_its_rollup" ~msg: - "The smart contract rollup node is interacting with rollup {addr} of \ - kind {kind}" + "The smart rollup node is interacting with rollup {addr} of kind {kind}" ~level:Notice ("addr", Protocol.Alpha_context.Sc_rollup.Address.encoding) ("kind", Data_encoding.string) @@ -67,7 +66,7 @@ module Simple = struct let connection_lost = declare_0 ~section - ~name:"sc_rollup_daemon_connection_lost" + ~name:"smart_rollup_daemon_connection_lost" ~msg:"connection to the node has been lost" ~level:Warning () @@ -75,7 +74,7 @@ module Simple = struct let cannot_connect = declare_2 ~section - ~name:"sc_rollup_daemon_cannot_connect" + ~name:"smart_rollup_daemon_cannot_connect" ~msg:"cannot connect to Tezos node ({count}) {error}" ~level:Warning ("count", Data_encoding.int31) @@ -85,7 +84,7 @@ module Simple = struct let wait_reconnect = declare_1 ~section - ~name:"sc_rollup_daemon_wait_reconnect" + ~name:"smart_rollup_daemon_wait_reconnect" ~msg:"Retrying to connect in {delay}s" ~level:Warning ("delay", Data_encoding.float) diff --git a/src/proto_alpha/bin_sc_rollup_node/event.mli b/src/proto_alpha/bin_sc_rollup_node/event.mli index 6496f9094b4e777ae52225a78d268b3bb4589332..c9cf18106e5d982864e4710f9b9b6d07564e74e4 100644 --- a/src/proto_alpha/bin_sc_rollup_node/event.mli +++ b/src/proto_alpha/bin_sc_rollup_node/event.mli @@ -24,7 +24,7 @@ (*****************************************************************************) (** This module defines functions that emit the events used when the smart - contract rollup node is running (see {!Daemon}). *) + rollup node is running (see {!Daemon}). *) open Protocol.Alpha_context @@ -32,12 +32,12 @@ val starting_node : unit -> unit Lwt.t val node_is_ready : rpc_addr:string -> rpc_port:int -> unit Lwt.t -(** [rollup_exists addr kind] emits the event that the smart contract rollup +(** [rollup_exists addr kind] emits the event that the smart rollup node is interacting with the rollup at address [addr] and of the given [kind]. *) val rollup_exists : addr:Sc_rollup.t -> kind:Sc_rollup.Kind.t -> unit Lwt.t -(** [shutdown_node exit_status] emits the event that the smart contract rollup +(** [shutdown_node exit_status] emits the event that the smart rollup node is stopping with exit status [exit_status]. *) val shutdown_node : int -> unit Lwt.t diff --git a/src/proto_alpha/bin_sc_rollup_node/inbox_event.ml b/src/proto_alpha/bin_sc_rollup_node/inbox_event.ml index 96ca1e6a139493ed6e18e7756b4b090cf05bb8fe..b3e57760ef6b40cf88e0a51a23de423b38f1d2d5 100644 --- a/src/proto_alpha/bin_sc_rollup_node/inbox_event.ml +++ b/src/proto_alpha/bin_sc_rollup_node/inbox_event.ml @@ -32,7 +32,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_inbox_starting" - ~msg:"Starting inbox tracker of the smart contract rollup node" + ~msg:"Starting inbox tracker of the smart rollup node" ~level:Notice () @@ -40,7 +40,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_inbox_stopping" - ~msg:"Stopping inbox tracker of the smart contract rollup node" + ~msg:"Stopping inbox tracker of the smart rollup node" ~level:Notice () diff --git a/src/proto_alpha/bin_sc_rollup_node/layer1_event.ml b/src/proto_alpha/bin_sc_rollup_node/layer1_event.ml index f8e2dd1edbb9d12bcfdc5f19c40520874be2a989..31aae66ddb528f96e9113f2a5641806f8f90b307 100644 --- a/src/proto_alpha/bin_sc_rollup_node/layer1_event.ml +++ b/src/proto_alpha/bin_sc_rollup_node/layer1_event.ml @@ -32,7 +32,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_layer_1_starting" - ~msg:"Starting layer 1 tracker of the smart contract rollup node" + ~msg:"Starting layer 1 tracker of the smart rollup node" ~level:Notice () @@ -40,7 +40,7 @@ module Simple = struct declare_0 ~section ~name:"sc_rollup_node_layer_1_stopping" - ~msg:"Stopping layer 1 tracker of the smart contract rollup node" + ~msg:"Stopping layer 1 tracker of the smart rollup node" ~level:Notice () diff --git a/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml b/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml index 3b34c51d83b2344baa553fa8e1c7412edbcf429b..5f3f62aea8a20d3f8e909657035516a4c474e49d 100644 --- a/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml +++ b/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml @@ -26,11 +26,11 @@ let sc_rollup_address_param = Tezos_clic.param - ~name:"sc-rollup-address" - ~desc:"The smart-contract rollup address" + ~name:"smart-rollup-address" + ~desc:"The smart rollup address" (Tezos_clic.parameter (fun _ s -> match Protocol.Alpha_context.Sc_rollup.Address.of_b58check_opt s with - | None -> failwith "Invalid smart-contract rollup address" + | None -> failwith "Invalid smart rollup address" | Some addr -> return addr)) let sc_rollup_node_operator_param = @@ -39,10 +39,10 @@ let sc_rollup_node_operator_param = ~name:"operator" ~desc: (Printf.sprintf - "Public key hash, or alias, of a smart-contract rollup node operator. \ - An operator can be specialized to a particular purpose by prefixing \ - its key or alias by said purpose, e.g. publish:alias_of_my_operator. \ - The possible purposes are: %s." + "Public key hash, or alias, of a smart rollup node operator. An \ + operator can be specialized to a particular purpose by prefixing its \ + key or alias by said purpose, e.g. publish:alias_of_my_operator. The \ + possible purposes are: %s." (String.concat ", " @@ Configuration.(List.map string_of_purpose purposes))) @@ Tezos_clic.parameter @@ -105,8 +105,7 @@ let rpc_addr_arg = ~placeholder:"rpc-address|ip" ~doc: (Format.sprintf - "The address the smart-contract rollup node listens to. Default value \ - is %s" + "The address the smart rollup node listens to. Default value is %s" default) Client_proto_args.string_parameter @@ -115,7 +114,7 @@ let metrics_addr_arg = ~long:"metrics-addr" ~placeholder: "ADDR:PORT or :PORT (by default ADDR is localhost and PORT is 9933)" - ~doc:"The address of the smart-contract rollup node metrics server." + ~doc:"The address of the smart rollup node metrics server." Client_proto_args.string_parameter let dal_node_addr_arg = @@ -125,8 +124,8 @@ let dal_node_addr_arg = ~placeholder:"dal-node-address|ip" ~doc: (Format.sprintf - "The address of the dal node from which the smart-contract rollup \ - node downloads slots. Default value is %s" + "The address of the dal node from which the smart rollup node \ + downloads slots. Default value is %s" default) Client_proto_args.string_parameter @@ -137,8 +136,7 @@ let rpc_port_arg = ~placeholder:"rpc-port" ~doc: (Format.sprintf - "The port the smart-contract rollup node listens to. Default value is \ - %s" + "The port the smart rollup node listens to. Default value is %s" default) Client_proto_args.int_parameter @@ -149,8 +147,8 @@ let dal_node_port_arg = ~placeholder:"dal-node-port" ~doc: (Format.sprintf - "The port of the dal node from which the smart-contract rollup node \ - downloads slots from. Default value is %s" + "The port of the dal node from which the smart rollup node downloads \ + slots from. Default value is %s" default) Client_proto_args.int_parameter @@ -161,8 +159,7 @@ let data_dir_arg = ~placeholder:"data-dir" ~doc: (Format.sprintf - "The path to the smart-contract rollup node data directory. Default \ - value is %s" + "The path to the smart rollup node data directory. Default value is %s" default) ~default Client_proto_args.string_parameter @@ -222,7 +219,7 @@ let injector_retention_period_arg = let group = { Tezos_clic.name = "sc_rollup.node"; - title = "Commands related to the smart-contract rollup node."; + title = "Commands related to the smart rollup node."; } let config_init_command = @@ -230,7 +227,7 @@ let config_init_command = let open Tezos_clic in command ~group - ~desc:"Configure the smart-contract rollup node." + ~desc:"Configure the smart rollup node." (args9 data_dir_arg rpc_addr_arg @@ -302,7 +299,7 @@ let config_init_command = let* () = save ~data_dir config in let*! () = cctxt#message - "Smart-contract rollup node configuration written in %s" + "Smart rollup node configuration written in %s" (config_filename ~data_dir) in return_unit) diff --git a/src/proto_alpha/bin_sc_rollup_node/node_context.mli b/src/proto_alpha/bin_sc_rollup_node/node_context.mli index 08cf5d4e09ed8368c6c6a6ef03192a1c96e4babb..2e5ed5bd3c4009ba035f5a336435e9a63f1358b5 100644 --- a/src/proto_alpha/bin_sc_rollup_node/node_context.mli +++ b/src/proto_alpha/bin_sc_rollup_node/node_context.mli @@ -36,18 +36,17 @@ type 'a t = { data_dir : string; (** Node data dir. *) l1_ctxt : Layer1.t; (** Layer 1 context to fetch blocks and monitor heads, etc.*) - rollup_address : Sc_rollup.t; - (** Smart contract rollup tracked by the rollup node. *) + rollup_address : Sc_rollup.t; (** Smart rollup tracked by the rollup node. *) operators : Configuration.operators; (** Addresses of the rollup node operators by purposes. *) genesis_info : Sc_rollup.Commitment.genesis_info; - (** Origination information of the smart contract rollup. *) + (** Origination information of the smart rollup. *) injector_retention_period : int; (** Number of blocks the injector will keep information about included operations. *) block_finality_time : int; (** Deterministic block finality time for the layer 1 protocol. *) - kind : Sc_rollup.Kind.t; (** Kind of the smart contract rollup. *) + kind : Sc_rollup.Kind.t; (** Kind of the smart rollup. *) fee_parameters : Configuration.fee_parameters; (** Fee parameters to use when injecting operations in layer 1. *) protocol_constants : Constants.t; diff --git a/src/proto_alpha/bin_sc_rollup_node/store.ml b/src/proto_alpha/bin_sc_rollup_node/store.ml index d4b49002017d970558277aeebd06e740b3a876be..2d615f718c4dd1205aecc397a064f2969e1e62ad 100644 --- a/src/proto_alpha/bin_sc_rollup_node/store.ml +++ b/src/proto_alpha/bin_sc_rollup_node/store.ml @@ -31,7 +31,7 @@ include Store_utils open Alpha_context module IStore = Irmin_store.Make (struct - let name = "Tezos smart-contract rollup node" + let name = "Tezos smart rollup node" end) include Store_utils.Make (IStore) diff --git a/src/proto_alpha/lib_sc_rollup/l2_message.ml b/src/proto_alpha/lib_sc_rollup/l2_message.ml index 71987dc50b8dfbfd6dc0a91d3c7916e3fedac529..cdf5f672edad9b25e3c5be261cb27dab238a933c 100644 --- a/src/proto_alpha/lib_sc_rollup/l2_message.ml +++ b/src/proto_alpha/lib_sc_rollup/l2_message.ml @@ -32,7 +32,7 @@ type t = { let content_encoding = let open Data_encoding in - def "sc_l2_message" ~description:"A hex encoded smart contact rollup message" + def "sc_l2_message" ~description:"A hex encoded smart rollup message" @@ string' Hex let encoding = @@ -57,7 +57,7 @@ module Hash = (struct let name = "sc_rollup_l2_message" - let title = "A SCORU L2 message" + let title = "A smart rollup layer 2 message" let b58check_prefix = "\003\250\179\247\196" (* scmsg(55) *) diff --git a/src/proto_alpha/lib_sc_rollup/sc_rollup_services.ml b/src/proto_alpha/lib_sc_rollup/sc_rollup_services.ml index 8a38c2910f6fd5b22332146f6e3cba9b0089f7af..724f8a708599238249dcf17b26c46ce562f5e101 100644 --- a/src/proto_alpha/lib_sc_rollup/sc_rollup_services.ml +++ b/src/proto_alpha/lib_sc_rollup/sc_rollup_services.ml @@ -308,21 +308,21 @@ module Global = struct let sc_rollup_address = Tezos_rpc.Service.get_service - ~description:"Smart-contract rollup address" + ~description:"Smart rollup address" ~query:Tezos_rpc.Query.empty ~output:Sc_rollup.Address.encoding - (path / "sc_rollup_address") + (path / "smart_rollup_address") let current_tezos_head = Tezos_rpc.Service.get_service - ~description:"Tezos head known to the smart-contract rollup node" + ~description:"Tezos head known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:(Data_encoding.option Tezos_crypto.Block_hash.encoding) (path / "tezos_head") let current_tezos_level = Tezos_rpc.Service.get_service - ~description:"Tezos level known to the smart-contract rollup node" + ~description:"Tezos level known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:(Data_encoding.option Data_encoding.int32) (path / "tezos_level") @@ -404,16 +404,14 @@ module Global = struct let hash = Tezos_rpc.Service.get_service - ~description: - "Tezos block hash of block known to the smart-contract rollup node" + ~description:"Tezos block hash of block known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:Tezos_crypto.Block_hash.encoding (path / "hash") let level = Tezos_rpc.Service.get_service - ~description: - "Level of Tezos block known to the smart-contract rollup node" + ~description:"Level of Tezos block known to the smart rollup node" ~query:Tezos_rpc.Query.empty ~output:Data_encoding.int32 (path / "level") diff --git a/tezt/lib_tezos/sc_rollup_node.ml b/tezt/lib_tezos/sc_rollup_node.ml index 3e0c6eb7882d8eb80e3ed58cf6e00e1ac585a5d7..7532d9b207abe9c5680f36c6fc5ee001eda25c6b 100644 --- a/tezt/lib_tezos/sc_rollup_node.ml +++ b/tezt/lib_tezos/sc_rollup_node.ml @@ -63,7 +63,7 @@ let check_error ?exit_code ?msg sc_node = match sc_node.status with | Not_running -> Test.fail - "Smart-contract rollup node %s is not running, it has no stderr" + "Smart rollup node %s is not running, it has no stderr" (name sc_node) | Running {process; _} -> Process.check_error ?exit_code ?msg process @@ -71,8 +71,7 @@ let wait sc_node = match sc_node.status with | Not_running -> Test.fail - "Smart-contract rollup node %s is not running, cannot wait for it to \ - terminate" + "Smart rollup node %s is not running, cannot wait for it to terminate" (name sc_node) | Running {process; _} -> Process.wait process @@ -151,11 +150,9 @@ let config_init sc_node ?loser_mode rollup_address = let process = spawn_config_init sc_node ?loser_mode rollup_address in let* output = Process.check_and_read_stdout process in match - output - =~* rex "Smart-contract rollup node configuration written in ([^\n]*)" + output =~* rex "Smart rollup node configuration written in ([^\n]*)" with - | None -> - failwith "Smart-contract rollup node configuration initialization failed" + | None -> failwith "Smart rollup node configuration initialization failed" | Some filename -> return filename module Config_file = struct @@ -204,7 +201,7 @@ let wait_for_ready sc_node = let promise, resolver = Lwt.task () in sc_node.persistent_state.pending_ready <- resolver :: sc_node.persistent_state.pending_ready ; - check_event sc_node "sc_rollup_node_is_ready.v0" promise + check_event sc_node "smart_rollup_node_is_ready.v0" promise let update_level sc_node current_level = (match sc_node.status with @@ -243,7 +240,7 @@ let wait_for_level ?timeout sc_node level = let handle_event sc_node {name; value; timestamp = _} = match name with - | "sc_rollup_node_is_ready.v0" -> set_ready sc_node + | "smart_rollup_node_is_ready.v0" -> set_ready sc_node | "sc_rollup_node_layer_1_new_head_processed.v0" -> let level = JSON.(value |-> "level" |> as_int) in update_level sc_node level diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out index f5693a0f2ae206b11182ef99b04b816ba450c7bf..5a8da1fc0a1f2a3f17c4be7eb2e46ef4f0e6bb64 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-smart-rollup-client-alpha rpc get /global/sc_rollup_address +./octez-smart-rollup-client-alpha rpc get /global/smart_rollup_address "[SMART_ROLLUP_HASH]" ./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out index 91f2a435e37315f9eec5e607a55b338574174970..7f82f85aba08e11b2192cfc58aa3cffda89a5cbe 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-smart-rollup-client-alpha rpc get /global/sc_rollup_address +./octez-smart-rollup-client-alpha rpc get /global/smart_rollup_address "[SMART_ROLLUP_HASH]" ./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index a9a6e5245aa503347b39f0e636d90736742a102f..b1815e019d33e825e9558b44e95820a3fb8e656a 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -458,7 +458,7 @@ let test_rollup_node_running ~kind = let metrics_addr = "localhost:" ^ string_of_int (Port.fresh ()) in let* () = Sc_rollup_node.run rollup_node ["--metrics-addr"; metrics_addr] in let* sc_rollup_from_rpc = - sc_rollup_node_rpc rollup_node "global/sc_rollup_address" + sc_rollup_node_rpc rollup_node "global/smart_rollup_address" in let sc_rollup_from_rpc = match sc_rollup_from_rpc with @@ -3698,7 +3698,7 @@ let test_rpcs ~kind = @@ fun _protocol sc_rollup_node sc_client sc_rollup node client -> let* () = Sc_rollup_node.run sc_rollup_node [] in let*! sc_rollup_address = - Sc_rollup_client.rpc_get ~hooks sc_client ["global"; "sc_rollup_address"] + Sc_rollup_client.rpc_get ~hooks sc_client ["global"; "smart_rollup_address"] in let sc_rollup_address = JSON.as_string sc_rollup_address in Check.((sc_rollup_address = sc_rollup) string)