diff --git a/.dockerignore b/.dockerignore index 9e1c77c079c9f8f0400ad8c4ece7ca61077cc09e..44c96706b7824c8a105fac9910c518a06e8f067e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -23,8 +23,8 @@ tezos-endorser-* tezos-accuser-* tezos-proxy-server tezos-signer -tezos-sc-rollup-node-* -tezos-sc-rollup-client-* +tezos-smart-rollup-node-* +tezos-smart-rollup-client-* octez-node octez-tx-rollup-* octez-protocol-compiler @@ -35,8 +35,8 @@ octez-endorser-* octez-accuser-* octez-proxy-server octez-signer -octez-sc-rollup-node-* -octez-sc-rollup-client-* +octez-smart-rollup-node-* +octez-smart-rollup-client-* scripts/opam-test-all.sh.DONE scripts/create_genesis/src diff --git a/.gitignore b/.gitignore index 1e45550b39e85f3a4444d1a80c55ad394d23f27d..270c6de592ca6530139f5415ae5c5abc7261cc0a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,10 +46,10 @@ __pycache__ /octez-tps-evaluation /tezos-tps-evaluation-* /octez-tps-evaluation-* -/tezos-sc-rollup-node-* -/octez-sc-rollup-node-* -/tezos-sc-rollup-client-* -/octez-sc-rollup-client-* +/tezos-smart-rollup-node-* +/octez-smart-rollup-node-* +/tezos-smart-rollup-client-* +/octez-smart-rollup-client-* /tezos-dal-node /octez-dal-node /octez-binaries diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 0e36245c3f042649159e63adc2ac3c587329774f..c5ba325fa07dffdffb15238912ce27ab14555735 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -289,30 +289,30 @@ opam:octez-proxy-server: variables: package: octez-proxy-server -opam:octez-sc-rollup-client-PtMumbai: +opam:octez-signer: extends: - .opam_template - - .rules_template__trigger_opam_batch_1 + - .rules_template__trigger_opam_batch_2 variables: - package: octez-sc-rollup-client-PtMumbai - -# Ignoring unreleased package octez-sc-rollup-client-alpha. + package: octez-signer -opam:octez-sc-rollup-node-PtMumbai: +opam:octez-smart-rollup-client-PtMumbai: extends: - .opam_template - .rules_template__trigger_opam_batch_1 variables: - package: octez-sc-rollup-node-PtMumbai + package: octez-smart-rollup-client-PtMumbai -# Ignoring unreleased package octez-sc-rollup-node-alpha. +# Ignoring unreleased package octez-smart-rollup-client-alpha. -opam:octez-signer: +opam:octez-smart-rollup-node-PtMumbai: extends: - .opam_template - - .rules_template__trigger_opam_batch_2 + - .rules_template__trigger_opam_batch_1 variables: - package: octez-signer + package: octez-smart-rollup-node-PtMumbai + +# Ignoring unreleased package octez-smart-rollup-node-alpha. # Ignoring unreleased package octez-snoop. @@ -1377,15 +1377,6 @@ opam:tezos-sapling: variables: package: tezos-sapling -opam:tezos-sc-rollup-016-PtMumbai: - extends: - - .opam_template - - .rules_template__trigger_opam_batch_1 - variables: - package: tezos-sc-rollup-016-PtMumbai - -# Ignoring unreleased package tezos-sc-rollup-alpha. - opam:tezos-scoru-wasm: extends: - .opam_template @@ -1454,6 +1445,15 @@ opam:tezos-signer-services: variables: package: tezos-signer-services +opam:tezos-smart-rollup-016-PtMumbai: + extends: + - .opam_template + - .rules_template__trigger_opam_batch_1 + variables: + package: tezos-smart-rollup-016-PtMumbai + +# Ignoring unreleased package tezos-smart-rollup-alpha. + opam:tezos-stdlib: extends: - .opam_template diff --git a/Makefile b/Makefile index af136ab86a08728ca1195565f64e62adfc5e1444..2353d82cf7f78669223f8a86dbaaad1b837ac947 100644 --- a/Makefile +++ b/Makefile @@ -146,8 +146,8 @@ clean-old-names: @rm -f tezos-tx-rollup-client-015-PtLimaPt @rm -f tezos-baker-alpha @rm -f tezos-accuser-alpha - @rm -f tezos-sc-rollup-node-alpha - @rm -f tezos-sc-rollup-client-alpha + @rm -f tezos-smart-rollup-node-alpha + @rm -f tezos-smart-rollup-client-alpha @rm -f tezos-snoop @rm -f tezos-dal-node # octez-validator should stay in this list for Octez 16.0 because we diff --git a/docs/alpha/smart_rollups.rst b/docs/alpha/smart_rollups.rst index d0245c86ba6807842e2cbd0ea02853f0bb926b26..807e28c5616b0accd5d10c93430df69acd40955d 100644 --- a/docs/alpha/smart_rollups.rst +++ b/docs/alpha/smart_rollups.rst @@ -408,7 +408,7 @@ rollup node is configured with the following command: .. code:: sh - octez-sc-rollup-node-alpha --base-dir "${OCLIENT_DIR}" \ + octez-smart-rollup-node-alpha --base-dir "${OCLIENT_DIR}" \ init operator config for "${SOR_ADDR}" \ with operators "${OPERATOR_ADDR}" \ --data-dir "${ROLLUP_NODE_DIR}" @@ -487,7 +487,7 @@ Second, the configured rollup node can be run: .. code:: sh - octez-sc-rollup-node-alpha" -d "${OCLIENT_DIR}" run --data-dir ${ROLLUP_NODE_DIR} + octez-smart-rollup-node-alpha" -d "${OCLIENT_DIR}" run --data-dir ${ROLLUP_NODE_DIR} The log should show that the rollup node follows the layer-1 chain and processes the inbox of each level. diff --git a/dune-project b/dune-project index 41c3f4d34e81b0622d5fee90d38032a79c8dec5c..8b363349b80ea084a10eb43fe4ff7c83f107a7c1 100644 --- a/dune-project +++ b/dune-project @@ -18,11 +18,11 @@ (package (name octez-node-config)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) -(package (name octez-sc-rollup-client-PtMumbai)) -(package (name octez-sc-rollup-client-alpha)) -(package (name octez-sc-rollup-node-PtMumbai)) -(package (name octez-sc-rollup-node-alpha)) (package (name octez-signer)) +(package (name octez-smart-rollup-client-PtMumbai)) +(package (name octez-smart-rollup-client-alpha)) +(package (name octez-smart-rollup-node-PtMumbai)) +(package (name octez-smart-rollup-node-alpha)) (package (name octez-snoop)) (package (name octez-tx-rollup-client-PtKathma)) (package (name octez-tx-rollup-client-PtLimaPt)) @@ -202,8 +202,6 @@ (package (name tezos-rpc-http-client-unix)) (package (name tezos-rpc-http-server)) (package (name tezos-sapling)) -(package (name tezos-sc-rollup-016-PtMumbai)) -(package (name tezos-sc-rollup-alpha)) (package (name tezos-scoru-wasm)) (package (name tezos-scoru-wasm-benchmark)(allow_empty)) (package (name tezos-scoru-wasm-fast)) @@ -218,6 +216,8 @@ (package (name tezos-shell-services-test-helpers)) (package (name tezos-signer-backends)) (package (name tezos-signer-services)) +(package (name tezos-smart-rollup-016-PtMumbai)) +(package (name tezos-smart-rollup-alpha)) (package (name tezos-stdlib)) (package (name tezos-stdlib-unix)) (package (name tezos-store)) diff --git a/manifest/main.ml b/manifest/main.ml index 19c522879a1c0bddec519f16603f42191573677a..4e91fc8e7221b3c277a91affcd557e42b04b823d 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4836,10 +4836,10 @@ module Protocol = Protocol let sc_rollup = only_if N.(number >= 016) @@ fun () -> public_lib - (sf "tezos-sc-rollup-%s" name_dash) + (sf "tezos-smart-rollup-%s" name_dash) ~path:(path // "lib_sc_rollup") ~synopsis: - "Tezos/Protocol: protocol specific library for `tezos-sc-rollup`" + "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -4855,10 +4855,11 @@ module Protocol = Protocol let _sc_rollup_client = only_if (active && N.(number >= 016)) @@ fun () -> public_exe - (sf "octez-sc-rollup-client-%s" short_hash) + (sf "octez-smart-rollup-client-%s" short_hash) ~internal_name:(sf "main_sc_rollup_client_%s" name_underscore) ~path:(path // "bin_sc_rollup_client") - ~synopsis:"Tezos/Protocol: `octez-sc-rollup-client-alpha` client binary" + ~synopsis: + "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary" ~release_status:executable_release_status ~deps: [ @@ -4880,10 +4881,10 @@ module Protocol = Protocol let _sc_rollup_node = only_if (active && N.(number >= 016)) @@ fun () -> public_exe - (sf "octez-sc-rollup-node-%s" short_hash) + (sf "octez-smart-rollup-node-%s" short_hash) ~internal_name:(sf "main_sc_rollup_node_%s" name_underscore) ~path:(path // "bin_sc_rollup_node") - ~synopsis:"Tezos/Protocol: Smart Contract Rollup node binary" + ~synopsis:"Tezos/Protocol: Smart Rollup node binary" ~release_status:executable_release_status ~deps: [ diff --git a/opam/octez-sc-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam similarity index 86% rename from opam/octez-sc-rollup-client-PtMumbai.opam rename to opam/octez-smart-rollup-client-PtMumbai.opam index fb2b37effcb8bc4317f61cf5e992d5973b520c93..8c4b049cb522cee88fb2a03e31a979bc01f39294 100644 --- a/opam/octez-sc-rollup-client-PtMumbai.opam +++ b/opam/octez-smart-rollup-client-PtMumbai.opam @@ -19,7 +19,7 @@ depends: [ "tezos-rpc-http" "tezos-rpc-http-client-unix" "tezos-protocol-016-PtMumbai" - "tezos-sc-rollup-016-PtMumbai" + "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } ] build: [ @@ -27,4 +27,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos/Protocol: `octez-sc-rollup-client-alpha` client binary" +synopsis: "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary" diff --git a/opam/octez-sc-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam similarity index 87% rename from opam/octez-sc-rollup-client-alpha.opam rename to opam/octez-smart-rollup-client-alpha.opam index d9caa24bbd411265cfafb8fe627be8fe13f8eb79..9b3690d5a19ff306a0f1285f3499123e7f6cee71 100644 --- a/opam/octez-sc-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -19,7 +19,7 @@ depends: [ "tezos-rpc-http" "tezos-rpc-http-client-unix" "tezos-protocol-alpha" - "tezos-sc-rollup-alpha" + "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } ] build: [ @@ -27,4 +27,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos/Protocol: `octez-sc-rollup-client-alpha` client binary" +synopsis: "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary" diff --git a/opam/octez-sc-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam similarity index 92% rename from opam/octez-sc-rollup-node-PtMumbai.opam rename to opam/octez-smart-rollup-node-PtMumbai.opam index 6eb19d924d37ec3dab53e4d46c39c3cb0b278451..139652f164fa94d776cb49f0019e9cb36afb85f5 100644 --- a/opam/octez-sc-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -26,7 +26,7 @@ depends: [ "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-shell-services" - "tezos-sc-rollup-016-PtMumbai" + "tezos-smart-rollup-016-PtMumbai" "tezos-layer2-utils-016-PtMumbai" "tezos-layer2-store" "data-encoding" { >= "0.7.1" & < "1.0.0" } @@ -45,4 +45,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos/Protocol: Smart Contract Rollup node binary" +synopsis: "Tezos/Protocol: Smart Rollup node binary" diff --git a/opam/octez-sc-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam similarity index 93% rename from opam/octez-sc-rollup-node-alpha.opam rename to opam/octez-smart-rollup-node-alpha.opam index a16e562c0164cd791f312557e0af95b08a4e0561..417ef8bd3afd8592bff05a16d873caef5314ad2e 100644 --- a/opam/octez-sc-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -26,7 +26,7 @@ depends: [ "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-shell-services" - "tezos-sc-rollup-alpha" + "tezos-smart-rollup-alpha" "tezos-layer2-utils-alpha" "tezos-layer2-store" "data-encoding" { >= "0.7.1" & < "1.0.0" } @@ -45,4 +45,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos/Protocol: Smart Contract Rollup node binary" +synopsis: "Tezos/Protocol: Smart Rollup node binary" diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index e153b49d8f37cc331bbb7d18cc946594ead75e8f..ba6c3d0e594537807a173edfb05b98c81ee29120 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -25,7 +25,7 @@ depends: [ "tezos-context" {with-test} "tezos-test-helpers" {with-test} "alcotest" { with-test & >= "1.5.0" } - "tezos-sc-rollup-016-PtMumbai" {with-test} + "tezos-smart-rollup-016-PtMumbai" {with-test} "tezos-crypto-dal" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index bab091fb319dee74602902acbe4a87d902f8ffac..441bd9f9cb9d1bfe1d1f9475da6ab6d47f7322af 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -25,7 +25,7 @@ depends: [ "tezos-context" {with-test} "tezos-test-helpers" {with-test} "alcotest" { with-test & >= "1.5.0" } - "tezos-sc-rollup-alpha" {with-test} + "tezos-smart-rollup-alpha" {with-test} "tezos-crypto-dal" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} diff --git a/opam/tezos-sc-rollup-016-PtMumbai.opam b/opam/tezos-sc-rollup-016-PtMumbai.opam deleted file mode 100644 index c673f1f37d8296585f6f34d39705e5ff922d3e58..0000000000000000000000000000000000000000 --- a/opam/tezos-sc-rollup-016-PtMumbai.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ppx_expect" - "tezos-base" - "tezos-protocol-016-PtMumbai" - "tezos-protocol-plugin-016-PtMumbai" - "tezos-rpc" - "tezos-injector-016-PtMumbai" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: protocol specific library for `tezos-sc-rollup`" diff --git a/opam/tezos-sc-rollup-alpha.opam b/opam/tezos-sc-rollup-alpha.opam deleted file mode 100644 index 15358b6a91c5f9e277465a5860e765df964f2925..0000000000000000000000000000000000000000 --- a/opam/tezos-sc-rollup-alpha.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ppx_expect" - "tezos-base" - "tezos-protocol-alpha" - "tezos-protocol-plugin-alpha" - "tezos-rpc" - "tezos-injector-alpha" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: protocol specific library for `tezos-sc-rollup`" diff --git a/script-inputs/experimental-executables b/script-inputs/experimental-executables index e884e4ebd9938a53bd04257d2a7ae4fea6fb74ee..8e5f75bab3900485d57e8886788996cee7c9ab1d 100644 --- a/script-inputs/experimental-executables +++ b/script-inputs/experimental-executables @@ -1,6 +1,6 @@ octez-dal-node octez-wasm-repl-alpha -octez-sc-rollup-node-alpha -octez-sc-rollup-client-alpha +octez-smart-rollup-node-alpha +octez-smart-rollup-client-alpha octez-accuser-alpha octez-baker-alpha diff --git a/script-inputs/released-executables b/script-inputs/released-executables index ede1902a87f2364511f979263e43d0475b042618..5ca3d4992997705ea1de9a9c0940480144297e1e 100644 --- a/script-inputs/released-executables +++ b/script-inputs/released-executables @@ -4,8 +4,8 @@ octez-codec octez-client octez-admin-client octez-node -octez-sc-rollup-node-PtMumbai -octez-sc-rollup-client-PtMumbai +octez-smart-rollup-node-PtMumbai +octez-smart-rollup-client-PtMumbai octez-accuser-PtMumbai octez-baker-PtMumbai octez-tx-rollup-node-PtLimaPt diff --git a/src/bin_client/octez-init-sandboxed-client.sh b/src/bin_client/octez-init-sandboxed-client.sh index 5107986c350490cb5b69c70494045679e8145245..98b9032653236edb47aeab1bffd4fe02290f5c9c 100755 --- a/src/bin_client/octez-init-sandboxed-client.sh +++ b/src/bin_client/octez-init-sandboxed-client.sh @@ -184,13 +184,13 @@ main () { echo "exec $baker \"\$@\"" >> $client_dir/bin/octez-baker-$protocol_without_number chmod +x $client_dir/bin/octez-baker-$protocol_without_number - echo '#!/bin/sh' > $client_dir/bin/octez-sc-rollup-node-$protocol_without_number - echo "exec $sc_rollup_node \"\$@\"" >> $client_dir/bin/octez-sc-rollup-node-$protocol_without_number - chmod +x $client_dir/bin/octez-sc-rollup-node-$protocol_without_number + echo '#!/bin/sh' > $client_dir/bin/octez-smart-rollup-node-$protocol_without_number + echo "exec $sc_rollup_node \"\$@\"" >> $client_dir/bin/octez-smart-rollup-node-$protocol_without_number + chmod +x $client_dir/bin/octez-smart-rollup-node-$protocol_without_number - echo '#!/bin/sh' > $client_dir/bin/octez-sc-rollup-client-$protocol_without_number - echo "exec $sc_rollup_client \"\$@\"" >> $client_dir/bin/octez-sc-rollup-client-$protocol_without_number - chmod +x $client_dir/bin/octez-sc-rollup-client-$protocol_without_number + echo '#!/bin/sh' > $client_dir/bin/octez-smart-rollup-client-$protocol_without_number + echo "exec $sc_rollup_client \"\$@\"" >> $client_dir/bin/octez-smart-rollup-client-$protocol_without_number + chmod +x $client_dir/bin/octez-smart-rollup-client-$protocol_without_number echo '#!/bin/sh' > $client_dir/bin/octez-accuser-$protocol_without_number echo "exec $accuser \"\$@\"" >> $client_dir/bin/octez-accuser-$protocol_without_number diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune index 368c1f16751a85520b31710b37cc8e8cbed8b1fc..ee90085777a9969caab503edee6e6b28ed5cf173 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune @@ -3,8 +3,8 @@ (executable (name main_sc_rollup_client_016_PtMumbai) - (public_name octez-sc-rollup-client-PtMumbai) - (package octez-sc-rollup-client-PtMumbai) + (public_name octez-smart-rollup-client-PtMumbai) + (package octez-smart-rollup-client-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -17,7 +17,7 @@ tezos-rpc-http tezos-rpc-http-client-unix tezos-protocol-016-PtMumbai - tezos-sc-rollup-016-PtMumbai + tezos-smart-rollup-016-PtMumbai uri) (link_flags (:standard) @@ -32,4 +32,4 @@ -open Tezos_client_base_unix -open Tezos_rpc_http_client_unix -open Tezos_protocol_016_PtMumbai - -open Tezos_sc_rollup_016_PtMumbai)) + -open Tezos_smart_rollup_016_PtMumbai)) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune index b0933eb851cde901e2717a27c5ed5569d80878a3..6620cadda3c2183633de2e9ae6a4d8e239aecb6b 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune @@ -3,8 +3,8 @@ (executable (name main_sc_rollup_node_016_PtMumbai) - (public_name octez-sc-rollup-node-PtMumbai) - (package octez-sc-rollup-node-PtMumbai) + (public_name octez-smart-rollup-node-PtMumbai) + (package octez-smart-rollup-node-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -26,7 +26,7 @@ tezos_dal_node_services tezos_dal_node_lib tezos-shell-services - tezos-sc-rollup-016-PtMumbai + tezos-smart-rollup-016-PtMumbai tezos-layer2-utils-016-PtMumbai tezos_layer2_store data-encoding @@ -59,7 +59,7 @@ -open Tezos_workers -open Tezos_dal_node_lib -open Tezos_shell_services - -open Tezos_sc_rollup_016_PtMumbai + -open Tezos_smart_rollup_016_PtMumbai -open Tezos_layer2_utils_016_PtMumbai -open Tezos_layer2_store -open Tezos_injector_016_PtMumbai diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune index 203636cabb7d9057381d01c71d79e885bd6a6863..3b67146983f21a6a816c7da3821761a333ea7ded 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune @@ -34,7 +34,7 @@ tezos-benchmark tezos-benchmark-016-PtMumbai tezos-benchmark-type-inference-016-PtMumbai - tezos-sc-rollup-016-PtMumbai + tezos-smart-rollup-016-PtMumbai tezos-crypto-dal tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters) @@ -47,7 +47,7 @@ -open Tezos_016_PtMumbai_test_helpers -open Tezos_benchmark_016_PtMumbai -open Tezos_benchmark_type_inference_016_PtMumbai - -open Tezos_sc_rollup_016_PtMumbai + -open Tezos_smart_rollup_016_PtMumbai -open Tezos_crypto_dal -open Tezos_base_test_helpers -open Tezos_protocol_016_PtMumbai_parameters)) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/dune b/src/proto_016_PtMumbai/lib_sc_rollup/dune index 8ca6db89fc4f9cb80837bb4ca709e3a88cdf0440..1a91e3e074f98b90dc85293435829bf4cd078fe1 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup/dune @@ -2,8 +2,8 @@ ; Edit file manifest/main.ml instead. (library - (name tezos_sc_rollup_016_PtMumbai) - (public_name tezos-sc-rollup-016-PtMumbai) + (name tezos_smart_rollup_016_PtMumbai) + (public_name tezos-smart-rollup-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries tezos-base diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index 2efb5907ffbdd43643555348282b53ebb19999b6..b9d8eb981b3994b82a30412fb9794b4c26b26184 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -3,8 +3,8 @@ (executable (name main_sc_rollup_client_alpha) - (public_name octez-sc-rollup-client-alpha) - (package octez-sc-rollup-client-alpha) + (public_name octez-smart-rollup-client-alpha) + (package octez-smart-rollup-client-alpha) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -17,7 +17,7 @@ tezos-rpc-http tezos-rpc-http-client-unix tezos-protocol-alpha - tezos-sc-rollup-alpha + tezos-smart-rollup-alpha uri) (link_flags (:standard) @@ -32,4 +32,4 @@ -open Tezos_client_base_unix -open Tezos_rpc_http_client_unix -open Tezos_protocol_alpha - -open Tezos_sc_rollup_alpha)) + -open Tezos_smart_rollup_alpha)) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index f2aa7ccb6255e0592ad00f8b248fc70858e09124..ae10da4f64f19173ecc80491cddff342d6bf0353 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -3,8 +3,8 @@ (executable (name main_sc_rollup_node_alpha) - (public_name octez-sc-rollup-node-alpha) - (package octez-sc-rollup-node-alpha) + (public_name octez-smart-rollup-node-alpha) + (package octez-smart-rollup-node-alpha) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -26,7 +26,7 @@ tezos_dal_node_services tezos_dal_node_lib tezos-shell-services - tezos-sc-rollup-alpha + tezos-smart-rollup-alpha tezos-layer2-utils-alpha tezos_layer2_store data-encoding @@ -59,7 +59,7 @@ -open Tezos_workers -open Tezos_dal_node_lib -open Tezos_shell_services - -open Tezos_sc_rollup_alpha + -open Tezos_smart_rollup_alpha -open Tezos_layer2_utils_alpha -open Tezos_layer2_store -open Tezos_injector_alpha diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index 0f3e72cf6829a9a89dc43045c54365afebc427ed..c1eb96b98f8c3ad547756cdaaa28792a57b3d0bc 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -34,7 +34,7 @@ tezos-benchmark tezos-benchmark-alpha tezos-benchmark-type-inference-alpha - tezos-sc-rollup-alpha + tezos-smart-rollup-alpha tezos-crypto-dal tezos-base-test-helpers tezos-protocol-alpha.parameters) @@ -47,7 +47,7 @@ -open Tezos_alpha_test_helpers -open Tezos_benchmark_alpha -open Tezos_benchmark_type_inference_alpha - -open Tezos_sc_rollup_alpha + -open Tezos_smart_rollup_alpha -open Tezos_crypto_dal -open Tezos_base_test_helpers -open Tezos_protocol_alpha_parameters)) diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune index 759a44c274e0eeece8b3931feb8901223cbc3d77..7eeca0d6858ee85e530d743e6e2528fdffdafcfb 100644 --- a/src/proto_alpha/lib_sc_rollup/dune +++ b/src/proto_alpha/lib_sc_rollup/dune @@ -2,8 +2,8 @@ ; Edit file manifest/main.ml instead. (library - (name tezos_sc_rollup_alpha) - (public_name tezos-sc-rollup-alpha) + (name tezos_smart_rollup_alpha) + (public_name tezos-smart-rollup-alpha) (instrumentation (backend bisect_ppx)) (libraries tezos-base diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out deleted file mode 100644 index 29c3c92c05e9b0376e532d68204f6527699e2afc..0000000000000000000000000000000000000000 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out +++ /dev/null @@ -1,105 +0,0 @@ -sc_rollup_commitment_of_rollup_node_first_published_at_level_global.out - -./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 -Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) -Operation successfully injected in the node. -Operation hash is '[OPERATION_HASH]' -NOT waiting for the operation to be included. -Use command - octez-client wait for [OPERATION_HASH] to be included --confirmations 1 --branch [BLOCK_HASH] -and/or an external block explorer to make sure that it has been included. -This sequence of operations was run: - Manager signed operations: - From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 - Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' - This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes - Address: [SC_ROLLUP_HASH] - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 - - -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' -2 - -./octez-client rpc get /chains/main/blocks/head/context/constants -{ "proof_of_work_nonce_size": 8, "nonce_length": 32, - "max_anon_ops_per_block": 132, "max_operation_data_length": 32768, - "max_proposals_per_delegate": 20, "max_micheline_node_count": 50000, - "max_micheline_bytes_limit": 50000, - "max_allowed_global_constants_depth": 10000, "cache_layout_size": 3, - "michelson_maximum_type_size": 2001, "preserved_cycles": 2, - "blocks_per_cycle": 8, "blocks_per_commitment": 4, - "nonce_revelation_threshold": 4, "blocks_per_stake_snapshot": 4, - "cycles_per_voting_period": 8, "hard_gas_limit_per_operation": "1040000", - "hard_gas_limit_per_block": "5200000", "proof_of_work_threshold": "-1", - "tokens_per_roll": "6000000000", "vdf_difficulty": "50000", - "seed_nonce_revelation_tip": "125000", "origination_size": 257, - "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "3921", - "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", - "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, - "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, - "liquidity_baking_toggle_ema_threshold": 1000000000, - "max_operations_time_to_live": 120, "minimal_block_delay": "1", - "delay_increment_per_round": "1", "consensus_committee_size": 256, - "consensus_threshold": 0, - "minimal_participation_ratio": { "numerator": 2, "denominator": 3 }, - "max_slashing_period": 2, "frozen_deposits_percentage": 5, - "double_baking_punishment": "640000000", - "ratio_of_frozen_deposits_slashed_per_double_endorsement": - { "numerator": 1, "denominator": 2 }, "cache_script_size": 100000000, - "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, - "tx_rollup_enable": true, "tx_rollup_origination_size": 4000, - "tx_rollup_hard_size_limit_per_inbox": 500000, - "tx_rollup_hard_size_limit_per_message": 5000, - "tx_rollup_max_withdrawals_per_batch": 15, - "tx_rollup_commitment_bond": "10000000000", - "tx_rollup_finality_period": 40000, "tx_rollup_withdraw_period": 40000, - "tx_rollup_max_inboxes_count": 40100, - "tx_rollup_max_messages_per_inbox": 1010, - "tx_rollup_max_commitments_count": 80100, - "tx_rollup_cost_per_byte_ema_factor": 120, - "tx_rollup_max_ticket_payload_size": 2048, - "tx_rollup_rejection_max_proof_size": 30000, - "tx_rollup_sunset_level": 3473409, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, - "sc_rollup_challenge_window_in_blocks": 20160, - "sc_rollup_max_available_messages": 1000000, - "sc_rollup_stake_amount_in_mutez": 32000000, - "sc_rollup_commitment_period_in_blocks": 30, - "sc_rollup_commitment_storage_size_in_bytes": 84, - "sc_rollup_max_lookahead_in_blocks": 30000 } - -./octez-sc-rollup-client-alpha rpc get /last_published_commitment -{ "commitment": - { "compressed_state": - "[SC_ROLLUP_STATE_HASH]", - "inbox_level": 32, - "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_messages": 0, "number_of_ticks": 0 }, - "hash": "[SC_ROLLUP_COMMITMENT_HASH]", - "published_at_level": 35 } - -./octez-sc-rollup-client-alpha rpc get /last_published_commitment -{ "commitment": - { "compressed_state": - "[SC_ROLLUP_STATE_HASH]", - "inbox_level": 32, - "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_messages": 0, "number_of_ticks": 0 }, - "hash": "[SC_ROLLUP_COMMITMENT_HASH]", - "published_at_level": 35 } diff --git a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out b/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out deleted file mode 100644 index 31d1cd2167b557e79c330e177aef497dde377c42..0000000000000000000000000000000000000000 --- a/tezt/_regressions/sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out +++ /dev/null @@ -1,147 +0,0 @@ -sc_rollup_commitment_of_rollup_node_handles_chain_reorgs.out - -./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith booting with --burn-cap 9999999 -Node is bootstrapped. -Estimated gas: 1600.696 units (will add 100 for safety) -Estimated storage: 6534 bytes added (will add 20 for safety) -Operation successfully injected in the node. -Operation hash is '[OPERATION_HASH]' -NOT waiting for the operation to be included. -Use command - octez-client wait for [OPERATION_HASH] to be included --confirmations 1 --branch [BLOCK_HASH] -and/or an external block explorer to make sure that it has been included. -This sequence of operations was run: - Manager signed operations: - From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000402 - Expected counter: 1 - Gas limit: 1701 - Storage limit: 6554 bytes - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000402 - payload fees(the block proposer) ....... +ꜩ0.000402 - Originate smart contract rollup of kind arith with boot sector '' - This smart contract rollup origination was successfully applied - Consumed gas: 1600.696 - Storage size: 6534 bytes - Address: [SC_ROLLUP_HASH] - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ1.6335 - storage fees ........................... +ꜩ1.6335 - - -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/initial_level' -2 - -./octez-client rpc get /chains/main/blocks/head/context/constants -{ "proof_of_work_nonce_size": 8, "nonce_length": 32, - "max_anon_ops_per_block": 132, "max_operation_data_length": 32768, - "max_proposals_per_delegate": 20, "max_micheline_node_count": 50000, - "max_micheline_bytes_limit": 50000, - "max_allowed_global_constants_depth": 10000, "cache_layout_size": 3, - "michelson_maximum_type_size": 2001, "preserved_cycles": 2, - "blocks_per_cycle": 8, "blocks_per_commitment": 4, - "nonce_revelation_threshold": 4, "blocks_per_stake_snapshot": 4, - "cycles_per_voting_period": 8, "hard_gas_limit_per_operation": "1040000", - "hard_gas_limit_per_block": "5200000", "proof_of_work_threshold": "-1", - "tokens_per_roll": "6000000000", "vdf_difficulty": "50000", - "seed_nonce_revelation_tip": "125000", "origination_size": 257, - "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "3921", - "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", - "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, - "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, - "liquidity_baking_toggle_ema_threshold": 1000000000, - "max_operations_time_to_live": 120, "minimal_block_delay": "1", - "delay_increment_per_round": "1", "consensus_committee_size": 256, - "consensus_threshold": 0, - "minimal_participation_ratio": { "numerator": 2, "denominator": 3 }, - "max_slashing_period": 2, "frozen_deposits_percentage": 5, - "double_baking_punishment": "640000000", - "ratio_of_frozen_deposits_slashed_per_double_endorsement": - { "numerator": 1, "denominator": 2 }, "cache_script_size": 100000000, - "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, - "tx_rollup_enable": true, "tx_rollup_origination_size": 4000, - "tx_rollup_hard_size_limit_per_inbox": 500000, - "tx_rollup_hard_size_limit_per_message": 5000, - "tx_rollup_max_withdrawals_per_batch": 15, - "tx_rollup_commitment_bond": "10000000000", - "tx_rollup_finality_period": 40000, "tx_rollup_withdraw_period": 40000, - "tx_rollup_max_inboxes_count": 40100, - "tx_rollup_max_messages_per_inbox": 1010, - "tx_rollup_max_commitments_count": 80100, - "tx_rollup_cost_per_byte_ema_factor": 120, - "tx_rollup_max_ticket_payload_size": 2048, - "tx_rollup_rejection_max_proof_size": 30000, - "tx_rollup_sunset_level": 3473409, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, - "sc_rollup_challenge_window_in_blocks": 20160, - "sc_rollup_max_available_messages": 1000000, - "sc_rollup_stake_amount_in_mutez": 32000000, - "sc_rollup_commitment_period_in_blocks": 30, - "sc_rollup_commitment_storage_size_in_bytes": 84, - "sc_rollup_max_lookahead_in_blocks": 30000 } - -./octez-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]' -Node is bootstrapped. -Estimated gas: 1652.301 units (will add 100 for safety) -Estimated storage: no bytes added -Operation successfully injected in the node. -Operation hash is '[OPERATION_HASH]' -NOT waiting for the operation to be included. -Use command - octez-client wait for [OPERATION_HASH] to be included --confirmations 1 --branch [BLOCK_HASH] -and/or an external block explorer to make sure that it has been included. -This sequence of operations was run: - Manager signed operations: - From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000457 - Expected counter: 2 - Gas limit: 1753 - Storage limit: 0 bytes - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000457 - payload fees(the block proposer) ....... +ꜩ0.000457 - Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH] - This operation sending a message to a smart contract rollup was successfully applied - Consumed gas: 1652.301 - Resulting inbox state: - rollup = [SC_ROLLUP_HASH] - level = 32 - current messages hash = CoWCiKBE7uyrqCwVM1ZRQEXatHvkqQU9GPf94ktpjasEgkRgKst3 - nb_available_messages = 1 - nb_messages_in_commitment_period = 1 - starting_level_of_current_commitment_period = 32 - message_counter = 1 - old_levels_messages = - content = CoUkdBQ53N7FWav8LuTvrcp3jyoxnpqk3xnEo3gSCgNwia4fq44j - index = 30 - back_pointers = CoVombgbRqaZQavbAhd8Fe9uPd2VkwetxbaeuN3ky612Y1BW3NvM - CoVombgbRqaZQavbAhd8Fe9uPd2VkwetxbaeuN3ky612Y1BW3NvM - CoW1mKR4SV9TNevf2emDd2y5vBSJoHpPZAaXcK4rg3qYRqQpqc7G - CoUoi6qvq4GfPg1uwb68W7M74XnGgLYcsZWw6tM21DhnF66Th1jz - CoVs7qYHAiJBuPs36A7NMDo47y1nhL6mbdb2gEtMQi1zrBbRQzaX - - - - -./octez-sc-rollup-client-alpha rpc get /last_stored_commitment -{ "commitment": - { "compressed_state": - "[SC_ROLLUP_STATE_HASH]", - "inbox_level": 32, - "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_messages": 0, "number_of_ticks": 0 }, - "hash": "[SC_ROLLUP_COMMITMENT_HASH]" } - -./octez-sc-rollup-client-alpha rpc get /last_published_commitment -{ "commitment": - { "compressed_state": - "[SC_ROLLUP_STATE_HASH]", - "inbox_level": 32, - "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_messages": 0, "number_of_ticks": 0 }, - "hash": "[SC_ROLLUP_COMMITMENT_HASH]", - "published_at_level": 35 } diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml index 884c331e7c9fead5a2f0c62906999c38adf4c795..69da5c04c2a744ce238053d660b753203f6b7de3 100644 --- a/tezt/lib_tezos/constant.ml +++ b/tezt/lib_tezos/constant.ml @@ -38,9 +38,9 @@ let tezos_snoop = "./octez-snoop" let tezos_protocol_compiler = "./octez-protocol-compiler" -let sc_rollup_node = "./octez-sc-rollup-node-alpha" +let sc_rollup_node = "./octez-smart-rollup-node-alpha" -let sc_rollup_client = "./octez-sc-rollup-client-alpha" +let sc_rollup_client = "./octez-smart-rollup-client-alpha" let tx_rollup_node = "./octez-tx-rollup-node" 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 5bd440ea3f58bd96a299a9c8a94c92d4e9545f32..230d4d71393c452153e46d5ce6c08ba422b6a2e6 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 @@ -62,5 +62,5 @@ This sequence of operations was run: Consumed gas: 1001.461 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\128\000" 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 149838136e9e3eff188e6ade1e01e7dcc5a89036..d037dce3ba18f4a7e6adb91a022110590a99df4c 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 @@ -37,7 +37,7 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/slot_headers +./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/slot_headers [ { "level": 3, "index": 0, "commitment": "sh23Xtg7DY2qvSKgM1TiQDLH4cGZ2tHQwiQ5usHYdBUMzkirZUEVkSKoBDvjQePseeKFnQDGc9" }, @@ -48,7 +48,7 @@ This sequence of operations was run: "commitment": "sh237VRQLZqf8Uno4hjiiJh8RJxuwhPF4xWnPq2VKuC2ZbwVp3w9nw36iGfLHzpQrbopWx8GFq" } ] -./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages +./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages [] ./octez-client --wait none send smart rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2 @@ -105,5 +105,5 @@ This sequence of operations was run: Consumed gas: 1021.532 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\001." 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 fcc1f81ff8d2b1194e2b78458a193c4c6dc103e5..6acc58384948580bf894b92d093d28d8725b45a8 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 @@ -37,7 +37,7 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/slot_headers +./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/slot_headers [ { "level": 3, "index": 0, "commitment": "sh23Xtg7DY2qvSKgM1TiQDLH4cGZ2tHQwiQ5usHYdBUMzkirZUEVkSKoBDvjQePseeKFnQDGc9" }, @@ -48,7 +48,7 @@ This sequence of operations was run: "commitment": "sh237VRQLZqf8Uno4hjiiJh8RJxuwhPF4xWnPq2VKuC2ZbwVp3w9nw36iGfLHzpQrbopWx8GFq" } ] -./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages +./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages [] ./octez-client --wait none send smart rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2 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 ae14c5fd5c8f50e9999df2a7702f336c8a24d1cd..f5693a0f2ae206b11182ef99b04b816ba450c7bf 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,10 +33,10 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-sc-rollup-client-alpha rpc get /global/sc_rollup_address +./octez-smart-rollup-client-alpha rpc get /global/sc_rollup_address "[SMART_ROLLUP_HASH]" -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "312d31", "312d32", "312d33", @@ -49,7 +49,7 @@ This sequence of operations was run: "scmsg2SY3VZWZ8y8491xbXvn8tQtHRCAq3zPJWQ7n4K6Rusw2YKVyNx", "scmsg2zdjgY1tnuHMZqMavgPyc7qNj9MMvY4ywd38yauj3WfaiqDieE" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "322d31", "322d32", "322d33", @@ -62,7 +62,7 @@ This sequence of operations was run: "scmsg2GAoC8FEUfHZfQAKotvjRMpmSknHRpn4w35Y1YWZ4uVZDYvzUL", "scmsg2sqy4npoYQq8iWJWQQgrdG126y3Btxn8ZzVPav8JmptWnVowGz" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "332d31", "332d32", "332d33", @@ -75,7 +75,7 @@ This sequence of operations was run: "scmsg3PVb7jXpE723XWdC1B8L34wVenMTi8r4b62Qja6owSMVo3h73C", "scmsg2BZBgg1AFG7Zsar6DD1ZKPK36UakNZNj78npg6SUBoR26FpBdQ" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "342d31", "342d32", "342d33", @@ -88,7 +88,7 @@ This sequence of operations was run: "scmsg3TMS4Q8jtUhr6YcgkMqwWAXKkXLJMhSRvJcMEgq61t8xftRMFv", "scmsg2AWA1jULPBJb7usha9gJg62T5PdiW9Uz1HdHLhaYDRx4qRvLTL" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "352d31", "352d32", "352d33", @@ -101,7 +101,7 @@ This sequence of operations was run: "scmsg3LQsvXBvj1qDWFRACbLuyAbZK6tHVTUeiYsPSU9KGxyf6ySxrY", "scmsg3oXBwG2rAT3cjgDbRNyBnTirrkqTAeVMxMSJ5KUno8daWpY2rL" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "362d31", "362d32", "362d33", @@ -114,7 +114,7 @@ This sequence of operations was run: "scmsg3MPjHQ6m6BPJaGnAan8kCnadyCbn37DKAZa7LTbTtz3N36JgtW", "scmsg2mUAHp9G2cJoqKwr4dpagFK6Wa4cNu7NGPXXB3zTfCpLmCP3Yr" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "372d31", "372d32", "372d33", @@ -127,7 +127,7 @@ This sequence of operations was run: "scmsg3YhsmhbfMXKmhsjGXej2ySwYFDYKQE1yUs7LcVkZ2ikaotWQKg", "scmsg28neefD54Wsf46QgPtv22mKT32oNFv5ToU95DDsufcWFCZoovM" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "382d31", "382d32", "382d33", @@ -140,7 +140,7 @@ This sequence of operations was run: "scmsg3RM54nLATBFqzCjvSwPybSbiiWJZey2ZiLbe1gjr9v9Vmoc9H3", "scmsg2NpFWt1MhyDGhacEUpaeEheC8XWzNC3LaNaECXwzpi39QqPX14" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "392d31", "392d32", "392d33", @@ -153,7 +153,7 @@ This sequence of operations was run: "scmsg2DBhcJVTm8JRWQHLWDXxiCi2PvUZzixqxkqyYupDZW2XU3cdvJ", "scmsg2jKWtDbw5Jsdpc453XsgAVBKyYUzt3pKKsZtQNtvJvhPemp4WN" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31302d31", "31302d32", "31302d33", @@ -166,7 +166,7 @@ This sequence of operations was run: "scmsg3YFj784yYxTr4LbNfaLpHGpN5hKJgbBA8gUEJ4vief5KL8U5vS", "scmsg2GY9Q5VTRSrjCPewduDXtPtZZ9hhMshPe3zUToBvFHTD9AhKkB" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31312d31", "31312d32", "31312d33", @@ -179,7 +179,7 @@ This sequence of operations was run: "scmsg3KLGXHeokSBbJcfsrvRkoAjMt5Yi7nj67WFHh6nkW8Ce8Kd4yn", "scmsg2Eaop6LYBSnKMQXqPWijq9fBa4nPw5ZLndHRCH97kumZqLT7pn" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31322d31", "31322d32", "31322d33", @@ -192,7 +192,7 @@ This sequence of operations was run: "scmsg3HMVWn75kiJ4Lr3KquJNQTkkFtwg9pmiKMythhUJ5h74Nznjd3", "scmsg24y1317Sy46HnzTpvCLRe88LghadZ4eAjkb6EzvEsQVRhPbKzu" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31332d31", "31332d32", "31332d33", @@ -205,7 +205,7 @@ This sequence of operations was run: "scmsg2Safqm8tXs1k51v1A7VMyALCDRn5DAgYCJ9kbUD38jwPqtob6B", "scmsg28V9X7iiXCDZM4mFCHKsMxuvc8wNopLGkcnZwo14sSs4dW1E73" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31342d31", "31342d32", "31342d33", @@ -218,7 +218,7 @@ This sequence of operations was run: "scmsg29adqVUp1NnCAVSZVaKCVbrUdMth3C1yuUvBRZtmW9hsDtm8d1", "scmsg2cDM9bscYDvXwkeB6h7RmN82wFgmL3wv5jJmwJukS9ju5zgKWA" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31352d31", "31352d32", "31352d33", @@ -231,32 +231,32 @@ This sequence of operations was run: "scmsg3qHUB6rys7GmC8XGGKRDrcKX2veZGkT9SkScHyWqLUCjq9PLjx", "scmsg3ZVMYBmAPwFfLDNXFDcBGzRChdFzLJ8tUMW46mGPGumZ6aq79q" ] -./octez-sc-rollup-client-alpha rpc get /global/block/head/hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/hash "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/5/hash +./octez-smart-rollup-client-alpha rpc get /global/block/5/hash "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/finalized/level +./octez-smart-rollup-client-alpha rpc get /global/block/finalized/level 16 -./octez-sc-rollup-client-alpha rpc get /global/block/head/num_messages +./octez-smart-rollup-client-alpha rpc get /global/block/head/num_messages "8" -./octez-sc-rollup-client-alpha rpc get /global/block/head/status +./octez-smart-rollup-client-alpha rpc get /global/block/head/status "Waiting for input message" -./octez-sc-rollup-client-alpha rpc get /global/block/head/ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/ticks "28" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/cemented/outbox/16/messages +./octez-smart-rollup-client-alpha rpc get /global/block/cemented/outbox/16/messages [] -./octez-sc-rollup-client-alpha rpc get /global/tezos_head +./octez-smart-rollup-client-alpha rpc get /global/tezos_head "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/tezos_level +./octez-smart-rollup-client-alpha rpc get /global/tezos_level 18 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 2a3ae6007ba439a1bb1d098dee521131ba7ef7a5..b713287e1fd71e63d05908ece07126cb6f3491ef 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 @@ -37,10 +37,10 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "0" ./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2 @@ -68,19 +68,19 @@ This sequence of operations was run: Consumed gas: 1001.273 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\007" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "23" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "23" ./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2 @@ -108,19 +108,19 @@ This sequence of operations was run: Consumed gas: 1001.273 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\n" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "44" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "44" ./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2 @@ -148,19 +148,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\r" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "66" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "66" ./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2 @@ -188,19 +188,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\016" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "88" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "88" ./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2 @@ -228,19 +228,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\019" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "110" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "110" ./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2 @@ -268,19 +268,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\022" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "132" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "132" ./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2 @@ -308,19 +308,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\025" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "154" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "154" ./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2 @@ -348,19 +348,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\028" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "176" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "176" ./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2 @@ -388,19 +388,19 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\031" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "198" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "198" ./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2 @@ -428,11 +428,11 @@ This sequence of operations was run: Consumed gas: 1001.279 -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\"" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "221" 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 66adf4afdd2d808c2147cff3530d8831afbef021..b6794d51f393eb4f9ba71c03a735d51372979cb2 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 @@ -37,152 +37,152 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "5" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\007" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "26" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "26" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\n" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "47" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "47" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\r" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "69" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "69" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\016" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "91" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "91" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\019" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "113" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "113" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\022" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "135" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "135" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\025" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "157" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "157" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\028" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "179" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "179" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\031" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "201" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "201" -./octez-sc-rollup-client-alpha get state value for vars/value --block head +./octez-smart-rollup-client-alpha get state value for vars/value --block head "\000\000\000\"" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "224" 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 6a5944b3f94b6b5bea4e61c620f70e61fbed1f05..91f2a435e37315f9eec5e607a55b338574174970 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,10 +33,10 @@ This sequence of operations was run: storage fees ........................... +ꜩ1.638 -./octez-sc-rollup-client-alpha rpc get /global/sc_rollup_address +./octez-smart-rollup-client-alpha rpc get /global/sc_rollup_address "[SMART_ROLLUP_HASH]" -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "312d31", "312d32", "312d33", @@ -49,7 +49,7 @@ This sequence of operations was run: "scmsg2SY3VZWZ8y8491xbXvn8tQtHRCAq3zPJWQ7n4K6Rusw2YKVyNx", "scmsg2zdjgY1tnuHMZqMavgPyc7qNj9MMvY4ywd38yauj3WfaiqDieE" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "322d31", "322d32", "322d33", @@ -62,7 +62,7 @@ This sequence of operations was run: "scmsg2GAoC8FEUfHZfQAKotvjRMpmSknHRpn4w35Y1YWZ4uVZDYvzUL", "scmsg2sqy4npoYQq8iWJWQQgrdG126y3Btxn8ZzVPav8JmptWnVowGz" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "332d31", "332d32", "332d33", @@ -75,7 +75,7 @@ This sequence of operations was run: "scmsg3PVb7jXpE723XWdC1B8L34wVenMTi8r4b62Qja6owSMVo3h73C", "scmsg2BZBgg1AFG7Zsar6DD1ZKPK36UakNZNj78npg6SUBoR26FpBdQ" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "342d31", "342d32", "342d33", @@ -88,7 +88,7 @@ This sequence of operations was run: "scmsg3TMS4Q8jtUhr6YcgkMqwWAXKkXLJMhSRvJcMEgq61t8xftRMFv", "scmsg2AWA1jULPBJb7usha9gJg62T5PdiW9Uz1HdHLhaYDRx4qRvLTL" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "352d31", "352d32", "352d33", @@ -101,7 +101,7 @@ This sequence of operations was run: "scmsg3LQsvXBvj1qDWFRACbLuyAbZK6tHVTUeiYsPSU9KGxyf6ySxrY", "scmsg3oXBwG2rAT3cjgDbRNyBnTirrkqTAeVMxMSJ5KUno8daWpY2rL" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "362d31", "362d32", "362d33", @@ -114,7 +114,7 @@ This sequence of operations was run: "scmsg3MPjHQ6m6BPJaGnAan8kCnadyCbn37DKAZa7LTbTtz3N36JgtW", "scmsg2mUAHp9G2cJoqKwr4dpagFK6Wa4cNu7NGPXXB3zTfCpLmCP3Yr" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "372d31", "372d32", "372d33", @@ -127,7 +127,7 @@ This sequence of operations was run: "scmsg3YhsmhbfMXKmhsjGXej2ySwYFDYKQE1yUs7LcVkZ2ikaotWQKg", "scmsg28neefD54Wsf46QgPtv22mKT32oNFv5ToU95DDsufcWFCZoovM" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "382d31", "382d32", "382d33", @@ -140,7 +140,7 @@ This sequence of operations was run: "scmsg3RM54nLATBFqzCjvSwPybSbiiWJZey2ZiLbe1gjr9v9Vmoc9H3", "scmsg2NpFWt1MhyDGhacEUpaeEheC8XWzNC3LaNaECXwzpi39QqPX14" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "392d31", "392d32", "392d33", @@ -153,7 +153,7 @@ This sequence of operations was run: "scmsg2DBhcJVTm8JRWQHLWDXxiCi2PvUZzixqxkqyYupDZW2XU3cdvJ", "scmsg2jKWtDbw5Jsdpc453XsgAVBKyYUzt3pKKsZtQNtvJvhPemp4WN" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31302d31", "31302d32", "31302d33", @@ -166,7 +166,7 @@ This sequence of operations was run: "scmsg3YFj784yYxTr4LbNfaLpHGpN5hKJgbBA8gUEJ4vief5KL8U5vS", "scmsg2GY9Q5VTRSrjCPewduDXtPtZZ9hhMshPe3zUToBvFHTD9AhKkB" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31312d31", "31312d32", "31312d33", @@ -179,7 +179,7 @@ This sequence of operations was run: "scmsg3KLGXHeokSBbJcfsrvRkoAjMt5Yi7nj67WFHh6nkW8Ce8Kd4yn", "scmsg2Eaop6LYBSnKMQXqPWijq9fBa4nPw5ZLndHRCH97kumZqLT7pn" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31322d31", "31322d32", "31322d33", @@ -192,7 +192,7 @@ This sequence of operations was run: "scmsg3HMVWn75kiJ4Lr3KquJNQTkkFtwg9pmiKMythhUJ5h74Nznjd3", "scmsg24y1317Sy46HnzTpvCLRe88LghadZ4eAjkb6EzvEsQVRhPbKzu" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31332d31", "31332d32", "31332d33", @@ -205,7 +205,7 @@ This sequence of operations was run: "scmsg2Safqm8tXs1k51v1A7VMyALCDRn5DAgYCJ9kbUD38jwPqtob6B", "scmsg28V9X7iiXCDZM4mFCHKsMxuvc8wNopLGkcnZwo14sSs4dW1E73" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31342d31", "31342d32", "31342d33", @@ -218,7 +218,7 @@ This sequence of operations was run: "scmsg29adqVUp1NnCAVSZVaKCVbrUdMth3C1yuUvBRZtmW9hsDtm8d1", "scmsg2cDM9bscYDvXwkeB6h7RmN82wFgmL3wv5jJmwJukS9ju5zgKWA" ] -./octez-sc-rollup-client-alpha rpc post /local/batcher/injection with '[ +./octez-smart-rollup-client-alpha rpc post /local/batcher/injection with '[ "31352d31", "31352d32", "31352d33", @@ -231,32 +231,32 @@ This sequence of operations was run: "scmsg3qHUB6rys7GmC8XGGKRDrcKX2veZGkT9SkScHyWqLUCjq9PLjx", "scmsg3ZVMYBmAPwFfLDNXFDcBGzRChdFzLJ8tUMW46mGPGumZ6aq79q" ] -./octez-sc-rollup-client-alpha rpc get /global/block/head/hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/hash "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/5/hash +./octez-smart-rollup-client-alpha rpc get /global/block/5/hash "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/finalized/level +./octez-smart-rollup-client-alpha rpc get /global/block/finalized/level 16 -./octez-sc-rollup-client-alpha rpc get /global/block/head/num_messages +./octez-smart-rollup-client-alpha rpc get /global/block/head/num_messages "8" -./octez-sc-rollup-client-alpha rpc get /global/block/head/status +./octez-smart-rollup-client-alpha rpc get /global/block/head/status "Waiting for input message" -./octez-sc-rollup-client-alpha rpc get /global/block/head/ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/ticks "99000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/cemented/outbox/16/messages +./octez-smart-rollup-client-alpha rpc get /global/block/cemented/outbox/16/messages [] -./octez-sc-rollup-client-alpha rpc get /global/tezos_head +./octez-smart-rollup-client-alpha rpc get /global/tezos_head "[BLOCK_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/tezos_level +./octez-smart-rollup-client-alpha rpc get /global/tezos_level 18 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 0dd9cf505f98e014f4f19ab29a24c94b4cd7b4d3..10c1c344d31ea516d996d254f04fe89443e8ae6d 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 @@ -37,10 +37,10 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "0" ./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2 @@ -68,16 +68,16 @@ This sequence of operations was run: Consumed gas: 1001.273 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "55000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "55000000000" ./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2 @@ -105,16 +105,16 @@ This sequence of operations was run: Consumed gas: 1001.273 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "110000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "110000000000" ./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2 @@ -142,16 +142,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "165000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "165000000000" ./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2 @@ -179,16 +179,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "220000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "220000000000" ./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2 @@ -216,16 +216,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "275000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "275000000000" ./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2 @@ -253,16 +253,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "330000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "330000000000" ./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2 @@ -290,16 +290,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "385000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "385000000000" ./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2 @@ -327,16 +327,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "440000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "440000000000" ./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2 @@ -364,16 +364,16 @@ This sequence of operations was run: Consumed gas: 1001.276 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "495000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "495000000000" ./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2 @@ -401,8 +401,8 @@ This sequence of operations was run: Consumed gas: 1001.279 -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "550000000000" 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 8d305321f9767e362cda0a65c133a8fe8d4b971e..8b9fd5a92778352ce0ab03b2d44470ba4e92dc4f 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 @@ -37,122 +37,122 @@ This sequence of operations was run: { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "44000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "99000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "99000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "154000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "154000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "209000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "209000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "264000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "264000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "319000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "319000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "374000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "374000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "429000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "429000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "484000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "484000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "539000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "539000000000" -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash +./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash "[SC_ROLLUP_PVM_STATE_HASH]" -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks +./octez-smart-rollup-client-alpha rpc get /global/block/head/total_ticks "594000000000"