From aa8b3fe7dac3054f01e6c552fb084a7bffd3c967 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Tue, 3 Jan 2023 15:48:26 +0100 Subject: [PATCH] RPC: Prefer "smart" over "sc" in the Octez node RPCs --- src/proto_016_PtMumbai/lib_plugin/RPC.ml | 22 +++---- src/proto_alpha/lib_plugin/RPC.ml | 26 ++++---- tezt/lib_tezos/RPC.ml | 61 +++++++++-------- tezt/lib_tezos/RPC.mli | 34 +++++----- tezt/long_tests/sc_rollup.ml | 3 +- tezt/tests/dal.ml | 9 +-- ...ith L1 (dac_rollup_arith_uses_reveals).out | 2 +- ... with L1 (dac_rollup_arith_wrong_hash).out | 2 +- ...ith L1 (rollup_node_applies_dal_pages).out | 4 +- ... with L1 (rollup_node_downloads_slots).out | 2 +- ...lpha- arith - boot sector is evaluated.out | 8 +-- ...ces PVM state with messages (external).out | 2 +- ...ces PVM state with messages (internal).out | 2 +- ...ces PVM state with messages (external).out | 2 +- ...ces PVM state with messages (internal).out | 2 +- tezt/tests/sc_rollup.ml | 65 ++++++++++++------- 16 files changed, 134 insertions(+), 112 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_plugin/RPC.ml b/src/proto_016_PtMumbai/lib_plugin/RPC.ml index b0ab6a0ad5d8..01b5d72c7029 100644 --- a/src/proto_016_PtMumbai/lib_plugin/RPC.ml +++ b/src/proto_016_PtMumbai/lib_plugin/RPC.ml @@ -1978,25 +1978,25 @@ module Sc_rollup = struct module S = struct let prefix : RPC_context.t RPC_path.context = - RPC_path.(open_root / "context" / "sc_rollups") + RPC_path.(open_root / "context" / "smart_rollups") let path_sc_rollup : (RPC_context.t, RPC_context.t * Sc_rollup.t) RPC_path.t = - RPC_path.(prefix / "sc_rollup" /: Sc_rollup.Address.rpc_arg) + RPC_path.(prefix / "smart_rollup" /: Sc_rollup.Address.rpc_arg) let path_sc_rollups : RPC_context.t RPC_path.context = RPC_path.(prefix / "all") let kind = RPC_service.get_service - ~description:"Kind of smart-contract rollup" + ~description:"Kind of smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.Kind.encoding RPC_path.(path_sc_rollup / "kind") let initial_pvm_state_hash = RPC_service.get_service - ~description:"Initial PVM state hash of smart-contract rollup" + ~description:"Initial PVM state hash of smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.State_hash.encoding RPC_path.(path_sc_rollup / "initial_pvm_state_hash") @@ -2004,8 +2004,7 @@ module Sc_rollup = struct let genesis_info = RPC_service.get_service ~description: - "Genesis information (level and commitment hash) for a \ - smart-contract rollup" + "Genesis information (level and commitment hash) for a smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.Commitment.genesis_info_encoding RPC_path.(path_sc_rollup / "genesis_info") @@ -2013,8 +2012,7 @@ module Sc_rollup = struct let last_cemented_commitment_hash_with_level = RPC_service.get_service ~description: - "Level and hash of the last cemented commitment for a smart-contract \ - rollup" + "Level and hash of the last cemented commitment for a smart rollup" ~query:RPC_query.empty ~output: (obj2 @@ -2026,7 +2024,7 @@ module Sc_rollup = struct RPC_service.get_service ~description: "The hash of the commitment on which the operator has staked on for \ - a smart-contract rollup" + a smart rollup" ~query:RPC_query.empty ~output:(obj1 (req "hash" Sc_rollup.Commitment.Hash.encoding)) RPC_path.( @@ -2035,7 +2033,7 @@ module Sc_rollup = struct let commitment = RPC_service.get_service - ~description:"Commitment for a smart contract rollup from its hash" + ~description:"Commitment for a smart rollup from its hash" ~query:RPC_query.empty ~output:Sc_rollup.Commitment.encoding RPC_path.( @@ -2130,14 +2128,14 @@ module Sc_rollup = struct let root = RPC_service.get_service - ~description:"List of all originated smart contract rollups" + ~description:"List of all originated smart rollups" ~query:RPC_query.empty ~output:(Data_encoding.list Sc_rollup.Address.encoding) path_sc_rollups let inbox = RPC_service.get_service - ~description:"Inbox for the smart contract rollups" + ~description:"Inbox for the smart rollups" ~query:RPC_query.empty ~output:Sc_rollup.Inbox.encoding RPC_path.(path_sc_rollups / "inbox") diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml index 02c3f436110c..c4148ba2ab6d 100644 --- a/src/proto_alpha/lib_plugin/RPC.ml +++ b/src/proto_alpha/lib_plugin/RPC.ml @@ -1982,25 +1982,25 @@ module Sc_rollup = struct module S = struct let prefix : RPC_context.t RPC_path.context = - RPC_path.(open_root / "context" / "sc_rollups") + RPC_path.(open_root / "context" / "smart_rollups") let path_sc_rollup : (RPC_context.t, RPC_context.t * Sc_rollup.t) RPC_path.t = - RPC_path.(prefix / "sc_rollup" /: Sc_rollup.Address.rpc_arg) + RPC_path.(prefix / "smart_rollup" /: Sc_rollup.Address.rpc_arg) let path_sc_rollups : RPC_context.t RPC_path.context = RPC_path.(prefix / "all") let kind = RPC_service.get_service - ~description:"Kind of smart-contract rollup" + ~description:"Kind of smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.Kind.encoding RPC_path.(path_sc_rollup / "kind") let initial_pvm_state_hash = RPC_service.get_service - ~description:"Initial PVM state hash of smart-contract rollup" + ~description:"Initial PVM state hash of smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.State_hash.encoding RPC_path.(path_sc_rollup / "initial_pvm_state_hash") @@ -2008,8 +2008,7 @@ module Sc_rollup = struct let genesis_info = RPC_service.get_service ~description: - "Genesis information (level and commitment hash) for a \ - smart-contract rollup" + "Genesis information (level and commitment hash) for a smart rollup" ~query:RPC_query.empty ~output:Sc_rollup.Commitment.genesis_info_encoding RPC_path.(path_sc_rollup / "genesis_info") @@ -2017,8 +2016,7 @@ module Sc_rollup = struct let last_cemented_commitment_hash_with_level = RPC_service.get_service ~description: - "Level and hash of the last cemented commitment for a smart-contract \ - rollup" + "Level and hash of the last cemented commitment for a smart rollup" ~query:RPC_query.empty ~output: (obj2 @@ -2030,9 +2028,9 @@ module Sc_rollup = struct RPC_service.get_service ~description: "The hash of the newest commitment on which the operator has staked \ - on for a smart-contract rollup. The hash can be absent if the \ - staked commitment is before the last cemented commitment, and \ - therefore the hash no longer exists in the context." + on for a smart rollup. The hash can be absent if the staked \ + commitment is before the last cemented commitment, and therefore \ + the hash no longer exists in the context." ~query:RPC_query.empty ~output:(option Sc_rollup.Commitment.Hash.encoding) RPC_path.( @@ -2041,7 +2039,7 @@ module Sc_rollup = struct let commitment = RPC_service.get_service - ~description:"Commitment for a smart contract rollup from its hash" + ~description:"Commitment for a smart rollup from its hash" ~query:RPC_query.empty ~output:Sc_rollup.Commitment.encoding RPC_path.( @@ -2138,14 +2136,14 @@ module Sc_rollup = struct let root = RPC_service.get_service - ~description:"List of all originated smart contract rollups" + ~description:"List of all originated smart rollups" ~query:RPC_query.empty ~output:(Data_encoding.list Sc_rollup.Address.encoding) path_sc_rollups let inbox = RPC_service.get_service - ~description:"Inbox for the smart contract rollups" + ~description:"Inbox for the smart rollups" ~query:RPC_query.empty ~output:Sc_rollup.Inbox.encoding RPC_path.(path_sc_rollups / "inbox") diff --git a/tezt/lib_tezos/RPC.ml b/tezt/lib_tezos/RPC.ml index 0efec0bc6cbe..2812698f3cf1 100644 --- a/tezt/lib_tezos/RPC.ml +++ b/tezt/lib_tezos/RPC.ml @@ -779,15 +779,15 @@ let get_chain_block_context_contract_all_ticket_balances ?(chain = "main") ] Fun.id -let get_chain_block_context_sc_rollups_all ?(chain = "main") ?(block = "head") - () = +let get_chain_block_context_smart_rollups_all ?(chain = "main") + ?(block = "head") () = make GET - ["chains"; chain; "blocks"; block; "context"; "sc_rollups"; "all"] + ["chains"; chain; "blocks"; block; "context"; "smart_rollups"; "all"] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_staker_games ?(chain = "main") - ?(block = "head") ~staker sc_rollup () = +let get_chain_block_context_smart_rollups_smart_rollup_staker_games + ?(chain = "main") ?(block = "head") ~staker sc_rollup () = make GET [ @@ -796,8 +796,8 @@ let get_chain_block_context_sc_rollups_sc_rollup_staker_games ?(chain = "main") "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "staker"; staker; @@ -805,15 +805,24 @@ let get_chain_block_context_sc_rollups_sc_rollup_staker_games ?(chain = "main") ] Fun.id -let get_chain_block_context_sc_rollups_all_inbox ?(chain = "main") +let get_chain_block_context_smart_rollups_all_inbox ?(chain = "main") ?(block = "head") () = make GET - ["chains"; chain; "blocks"; block; "context"; "sc_rollups"; "all"; "inbox"] + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "smart_rollups"; + "all"; + "inbox"; + ] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_genesis_info ?(chain = "main") - ?(block = "head") sc_rollup = +let get_chain_block_context_smart_rollups_smart_rollup_genesis_info + ?(chain = "main") ?(block = "head") sc_rollup = make GET [ @@ -822,14 +831,14 @@ let get_chain_block_context_sc_rollups_sc_rollup_genesis_info ?(chain = "main") "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "genesis_info"; ] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments +let get_chain_block_context_smart_rollups_smart_rollup_stakers_commitments ?(chain = "main") ?(block = "head") sc_rollup = make GET @@ -839,14 +848,14 @@ let get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "stakers_commitments"; ] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_last_cemented_commitment_hash_with_level +let get_chain_block_context_smart_rollups_smart_rollup_last_cemented_commitment_hash_with_level ?(chain = "main") ?(block = "head") sc_rollup = make GET @@ -856,15 +865,15 @@ let get_chain_block_context_sc_rollups_sc_rollup_last_cemented_commitment_hash_w "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "last_cemented_commitment_hash_with_level"; ] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_commitment ?(chain = "main") - ?(block = "head") ~sc_rollup ~hash () = +let get_chain_block_context_smart_rollups_smart_rollup_commitment + ?(chain = "main") ?(block = "head") ~sc_rollup ~hash () = make GET [ @@ -873,15 +882,15 @@ let get_chain_block_context_sc_rollups_sc_rollup_commitment ?(chain = "main") "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "commitment"; hash; ] Fun.id -let get_chain_block_context_sc_rollups_sc_rollup_staker_staked_on_commitment +let get_chain_block_context_smart_rollups_smart_rollup_staker_staked_on_commitment ?(chain = "main") ?(block = "head") ~sc_rollup staker = make GET @@ -891,8 +900,8 @@ let get_chain_block_context_sc_rollups_sc_rollup_staker_staked_on_commitment "blocks"; block; "context"; - "sc_rollups"; - "sc_rollup"; + "smart_rollups"; + "smart_rollup"; sc_rollup; "staker"; staker; diff --git a/tezt/lib_tezos/RPC.mli b/tezt/lib_tezos/RPC.mli index c47817acfd9b..947e206085eb 100644 --- a/tezt/lib_tezos/RPC.mli +++ b/tezt/lib_tezos/RPC.mli @@ -763,34 +763,34 @@ val post_chain_block_context_contract_ticket_balance : val get_chain_block_context_contract_all_ticket_balances : ?chain:string -> ?block:string -> id:string -> unit -> JSON.t t -(** {2 Smart contract rollup RPC module} *) +(** {2 Smart rollup RPC module} *) -(** RPC: [GET chains//blocks//context/sc_rollups/all] *) -val get_chain_block_context_sc_rollups_all : +(** RPC: [GET chains//blocks//context/smart_rollups/all] *) +val get_chain_block_context_smart_rollups_all : ?chain:string -> ?block:string -> unit -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/sc_rollup//staker//games] *) -val get_chain_block_context_sc_rollups_sc_rollup_staker_games : +(** RPC: [GET chains//blocks//context/smart_rollups/smart_rollup//staker//games] *) +val get_chain_block_context_smart_rollups_smart_rollup_staker_games : ?chain:string -> ?block:string -> staker:string -> string -> unit -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/all/inbox] *) -val get_chain_block_context_sc_rollups_all_inbox : +(** RPC: [GET chains//blocks//context/smart_rollups/all/inbox] *) +val get_chain_block_context_smart_rollups_all_inbox : ?chain:string -> ?block:string -> unit -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/sc_rollup//genesis_info] *) -val get_chain_block_context_sc_rollups_sc_rollup_genesis_info : +(** RPC: [GET chains//blocks//context/smart_rollups/smart_rollup//genesis_info] *) +val get_chain_block_context_smart_rollups_smart_rollup_genesis_info : ?chain:string -> ?block:string -> string -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/sc_rollup//stakers_commitments] *) -val get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments : +(** RPC: [GET chains//blocks//context/smart_rollups/smart_rollup//stakers_commitments] *) +val get_chain_block_context_smart_rollups_smart_rollup_stakers_commitments : ?chain:string -> ?block:string -> string -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/sc_rollup//get_last_cemented_commitment_hash_with_level] *) -val get_chain_block_context_sc_rollups_sc_rollup_last_cemented_commitment_hash_with_level : +(** RPC: [GET chains//blocks//context/smart_rollups/smart_rollup//get_last_cemented_commitment_hash_with_level] *) +val get_chain_block_context_smart_rollups_smart_rollup_last_cemented_commitment_hash_with_level : ?chain:string -> ?block:string -> string -> JSON.t t -(** RPC: [GET chains//blocks//context/sc_rollups/sc_rollup//commitment/] *) -val get_chain_block_context_sc_rollups_sc_rollup_commitment : +(** RPC: [GET chains//blocks//context/smart_rollups/smart_rollup//commitment/] *) +val get_chain_block_context_smart_rollups_smart_rollup_commitment : ?chain:string -> ?block:string -> sc_rollup:string -> @@ -798,8 +798,8 @@ val get_chain_block_context_sc_rollups_sc_rollup_commitment : unit -> JSON.t t -(** RPC: [GET: chains//blocks//context/sc_rollups/sc_rollup//staker//staked_on_commitment] *) -val get_chain_block_context_sc_rollups_sc_rollup_staker_staked_on_commitment : +(** RPC: [GET: chains//blocks//context/smart_rollups/smart_rollup//staker//staked_on_commitment] *) +val get_chain_block_context_smart_rollups_smart_rollup_staker_staked_on_commitment : ?chain:string -> ?block:string -> sc_rollup:string -> string -> JSON.t t (** {2 Delegates RPC module } *) diff --git a/tezt/long_tests/sc_rollup.ml b/tezt/long_tests/sc_rollup.ml index 5a619152e60a..762706e33ba2 100644 --- a/tezt/long_tests/sc_rollup.ml +++ b/tezt/long_tests/sc_rollup.ml @@ -157,7 +157,8 @@ let test_rollup_node_advances_pvm_state protocols ~test_name ~boot_sector let go ~internal client sc_rollup sc_rollup_node = let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml index 61704e5e3a39..bdcd47f8c5fa 100644 --- a/tezt/tests/dal.ml +++ b/tezt/tests/dal.ml @@ -1358,7 +1358,7 @@ let rollup_node_stores_dal_slots ?expand_test _protocol dal_node sc_rollup_node (* 2. Run rollup node for an originated rollup. *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info sc_rollup_address in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1509,7 +1509,8 @@ let rollup_node_stores_dal_slots ?expand_test _protocol dal_node sc_rollup_node let rollup_node_interprets_dal_pages client sc_rollup sc_rollup_node = let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let sc_rollup_client = Sc_rollup_client.create sc_rollup_node in @@ -1710,7 +1711,7 @@ let test_rollup_arith_uses_reveals _protocol dal_node sc_rollup_node sc_rollup_address _node client _pvm_name = let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info sc_rollup_address in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1786,7 +1787,7 @@ let test_reveals_fails_on_wrong_hash _protocol dal_node sc_rollup_node in let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info sc_rollup_address in let init_level = JSON.(genesis_info |-> "level" |> as_int) in diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out index 1dd4daba69d5..1fce7298224b 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out index 040b08bc5256..af3985021a9b 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out index 83b90809efe9..4579d8d0cbf5 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } @@ -76,7 +76,7 @@ This sequence of operations was run: Consumed gas: 1002.610 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out index 57ab162317cb..0cf5e4f11c26 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out index ff5fb3ef522b..3329fd1d3d25 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out @@ -67,22 +67,22 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/commitment/[SC_ROLLUP_COMMITMENT_HASH]' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/commitment/[SC_ROLLUP_COMMITMENT_HASH]' { "compressed_state": "[SC_ROLLUP_PVM_STATE_HASH]", "inbox_level": 2, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", "number_of_ticks": "0" } -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 3, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/commitment/[SC_ROLLUP_COMMITMENT_HASH]' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/commitment/[SC_ROLLUP_COMMITMENT_HASH]' { "compressed_state": "[SC_ROLLUP_PVM_STATE_HASH]", "inbox_level": 3, diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out index 08cd08d02521..1f00d20744af 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out index d32676b18ea0..243f9653d285 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out index 64ad8e6d4a1e..d9bfbb9c59ac 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out index ce858e5b36b4..b9943232d8d2 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out @@ -33,7 +33,7 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SMART_ROLLUP_HASH]/genesis_info' +./octez-client rpc get '/chains/main/blocks/head/context/smart_rollups/smart_rollup/[SMART_ROLLUP_HASH]/genesis_info' { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 69f93106bb96..7b00ba67e248 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -325,7 +325,8 @@ let number_of_ticks (_hash, (commitment : Sc_rollup_client.commitment), _level) let stakers_commitments ~sc_rollup client = let* json = RPC.Client.call client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments + @@ RPC + .get_chain_block_context_smart_rollups_smart_rollup_stakers_commitments sc_rollup in let stakers_commitments = @@ -341,7 +342,7 @@ let last_cemented_commitment_hash_with_level ~sc_rollup client = let* json = RPC.Client.call client @@ RPC - .get_chain_block_context_sc_rollups_sc_rollup_last_cemented_commitment_hash_with_level + .get_chain_block_context_smart_rollups_smart_rollup_last_cemented_commitment_hash_with_level sc_rollup in let hash = JSON.(json |-> "hash" |> as_string) in @@ -352,7 +353,7 @@ let get_staked_on_commitment ~sc_rollup ~staker client = let* json = RPC.Client.call client @@ RPC - .get_chain_block_context_sc_rollups_sc_rollup_staker_staked_on_commitment + .get_chain_block_context_smart_rollups_smart_rollup_staker_staked_on_commitment ~sc_rollup staker in @@ -510,7 +511,8 @@ let test_rollup_get_genesis_info ~kind = in let* genesis_info = RPC.Client.call tezos_client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let genesis_hash = JSON.(genesis_info |-> "commitment_hash" |> as_string) in let genesis_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -719,7 +721,7 @@ let parse_inbox json = let get_inbox_from_tezos_node client = let* inbox = RPC.Client.call client - @@ RPC.get_chain_block_context_sc_rollups_all_inbox () + @@ RPC.get_chain_block_context_smart_rollups_all_inbox () in parse_inbox inbox @@ -1004,7 +1006,8 @@ let sc_rollup_node_batcher sc_rollup_node sc_rollup_client sc_rollup node client ~error_msg:"Only %L messages are included instead of %R." ; let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let* levels_to_commitment = @@ -1040,7 +1043,7 @@ let test_rollup_list ~kind = @@ fun protocol -> let* _node, client = setup_l1 protocol in let* rollups = - RPC.Client.call client @@ RPC.get_chain_block_context_sc_rollups_all () + RPC.Client.call client @@ RPC.get_chain_block_context_smart_rollups_all () in let rollups = JSON.as_list rollups in let () = @@ -1052,7 +1055,7 @@ let test_rollup_list ~kind = let* scoru_addresses = originate_sc_rollups ~kind 10 client in let* () = Client.bake_for_and_wait client in let* rollups = - RPC.Client.call client @@ RPC.get_chain_block_context_sc_rollups_all () + RPC.Client.call client @@ RPC.get_chain_block_context_smart_rollups_all () in let rollups = JSON.as_list rollups |> List.map JSON.as_string |> String_set.of_list @@ -1080,7 +1083,8 @@ let test_rollup_node_boots_into_initial_state ~kind = @@ fun _protocol sc_rollup_node sc_rollup_client sc_rollup _node client -> let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let* () = Sc_rollup_node.run sc_rollup_node [] in @@ -1124,7 +1128,8 @@ let test_rollup_node_advances_pvm_state ?regression ~title ?boot_sector -> let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let* () = Sc_rollup_node.run sc_rollup_node [] in @@ -1305,7 +1310,7 @@ let check_commitment_eq (commitment, name) (expected_commitment, exp_name) = let tezos_client_get_commitment client sc_rollup commitment_hash = let* json = RPC.Client.call client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_commitment + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_commitment ~sc_rollup ~hash:commitment_hash () @@ -1361,7 +1366,8 @@ let commitment_stored _protocol sc_rollup_node sc_rollup_client sc_rollup _node *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1502,7 +1508,8 @@ let commitment_not_stored_if_non_final _protocol sc_rollup_node sc_rollup_client *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1566,7 +1573,8 @@ let commitments_messages_reset kind _protocol sc_rollup_node sc_rollup_client *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1645,7 +1653,8 @@ let commitment_stored_robust_to_failures _protocol sc_rollup_node *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1734,7 +1743,8 @@ let commitments_reorgs ~kind _protocol sc_rollup_node sc_rollup_client sc_rollup *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -1920,7 +1930,8 @@ let commitment_before_lcc_not_published _protocol sc_rollup_node (* Rollup node 1 processes messages, produces and publishes two commitments. *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in @@ -2104,7 +2115,8 @@ let first_published_level_is_global _protocol sc_rollup_node sc_rollup_client (* Rollup node 1 processes messages, produces and publishes two commitments. *) let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let* commitment_period = get_sc_rollup_commitment_period_in_blocks client in @@ -2302,7 +2314,8 @@ let test_rollup_origination_boot_sector ~boot_sector ~kind = -> let* genesis_info = RPC.Client.call ~hooks tezos_client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let genesis_commitment_hash = @@ -2310,7 +2323,7 @@ let test_rollup_origination_boot_sector ~boot_sector ~kind = in let* init_commitment = RPC.Client.call ~hooks tezos_client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_commitment + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_commitment ~sc_rollup ~hash:genesis_commitment_hash () @@ -2357,14 +2370,15 @@ let test_boot_sector_is_evaluated ~boot_sector1 ~boot_sector2 ~kind = let genesis_state_hash ~sc_rollup tezos_client = let* genesis_info = RPC.Client.call ~hooks tezos_client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let commitment_hash = JSON.(genesis_info |-> "commitment_hash" |> as_string) in let* commitment = RPC.Client.call ~hooks tezos_client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_commitment + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_commitment ~sc_rollup ~hash:commitment_hash () @@ -2597,7 +2611,7 @@ let test_consecutive_commitments _protocol _rollup_node _rollup_client sc_rollup let*? process = RPC.Client.spawn tezos_client @@ RPC - .get_chain_block_context_sc_rollups_sc_rollup_staker_staked_on_commitment + .get_chain_block_context_smart_rollups_smart_rollup_staker_staked_on_commitment ~sc_rollup operator in @@ -2731,7 +2745,7 @@ let test_refutation_scenario ?commitment_period ?challenge_window ~variant ~kind let keep_going client = let* game = RPC.Client.call client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_staker_games + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_staker_games ~staker:bootstrap1_key sc_rollup_address () @@ -3780,7 +3794,8 @@ let test_messages_processed_by_commitment ~kind = let* {commitment_period_in_blocks; _} = get_sc_rollup_constants client in let* genesis_info = RPC.Client.call ~hooks client - @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup + @@ RPC.get_chain_block_context_smart_rollups_smart_rollup_genesis_info + sc_rollup in let init_level = JSON.(genesis_info |-> "level" |> as_int) in let store_commitment_level = -- GitLab