From 00ad547045f73f7f7e9f09d5597b797a787b02e3 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Fri, 10 Jun 2022 15:53:13 +0100 Subject: [PATCH 1/2] Proto: missing renames --- src/proto_alpha/lib_protocol/apply.ml | 3 ++- src/proto_alpha/lib_protocol/operation_repr.ml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index 7d4f268b2c9d..d42c765fe1fc 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -1868,7 +1868,8 @@ let apply_external_manager_operation_content : ~inclusion_proof ~message >>=? fun _ctxt -> - failwith "Sc_rolup_atomic_batch operation is not yet supported." + failwith + "Sc_rollup_execute_outbox_message operation is not yet supported." | Sc_rollup_recover_bond {sc_rollup} -> Sc_rollup.Stake_storage.withdraw_stake ctxt sc_rollup source >>=? fun (ctxt, balance_updates) -> diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index b0573d630273..4e737928a4de 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -551,7 +551,7 @@ let sc_rollup_operation_refute_tag = sc_rollup_operation_tag_offset + 4 let sc_rollup_operation_timeout_tag = sc_rollup_operation_tag_offset + 5 -let sc_rollup_operation_atomic_batch_tag = sc_rollup_operation_tag_offset + 6 +let sc_rollup_execute_outbox_message_tag = sc_rollup_operation_tag_offset + 6 let sc_rollup_operation_recover_bond_tag = sc_rollup_operation_tag_offset + 7 @@ -1094,7 +1094,7 @@ module Encoding = struct let[@coq_axiom_with_reason "gadt"] sc_rollup_execute_outbox_message_case = MCase { - tag = sc_rollup_operation_atomic_batch_tag; + tag = sc_rollup_execute_outbox_message_tag; name = "sc_rollup_execute_outbox_message"; encoding = obj6 @@ -1557,7 +1557,7 @@ module Encoding = struct let sc_rollup_execute_outbox_message_case = make_manager_case - sc_rollup_operation_atomic_batch_tag + sc_rollup_execute_outbox_message_tag Manager_operations.sc_rollup_execute_outbox_message_case let sc_rollup_recover_bond_case = -- GitLab From 49b091a13766dbec912babcf348015852ada3ab4 Mon Sep 17 00:00:00 2001 From: Joel Bjornson Date: Fri, 10 Jun 2022 15:55:35 +0100 Subject: [PATCH 2/2] Proto: missing case for execute-outbox-message --- src/proto_alpha/lib_protocol/apply_results.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index e24da912fc8e..591e5ec23847 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -2368,6 +2368,7 @@ let contents_and_result_encoding = make sc_rollup_publish_case; make sc_rollup_refute_case; make sc_rollup_timeout_case; + make sc_rollup_execute_outbox_message_case; make sc_rollup_recover_bond_case; ] -- GitLab