From 834c81aa5cd39f8e9208ec87820e453eb1aed6e6 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Tue, 14 Jan 2025 09:51:00 +0100 Subject: [PATCH 1/3] quebec/baker: add a minimum delta at the end of round --- src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml b/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml index 2c6cadbdb841..89ad7948d5df 100644 --- a/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml +++ b/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml @@ -528,9 +528,11 @@ let compute_next_timeout state : Baking_state.timeout_kind Lwt.t tzresult Lwt.t match round_proposer state ~level:`Current (snd next_round) with | Some _ -> let delta = - state.global_state.constants.parametric.minimal_block_delay - |> Period.to_seconds - |> fun d -> Int64.div d 5L + max + 1L + ( state.global_state.constants.parametric.minimal_block_delay + |> Period.to_seconds + |> fun d -> Int64.div d 5L ) in (* NB: this means 6 seconds delay, if the first round duration is 30. *) -- GitLab From 47c434df0179e27669bf83a8fcdd031a90625d6e Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Tue, 14 Jan 2025 09:51:52 +0100 Subject: [PATCH 2/3] alpha/baker: add a minimum delta at the end of round --- src/proto_alpha/lib_delegate/baking_scheduling.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_delegate/baking_scheduling.ml b/src/proto_alpha/lib_delegate/baking_scheduling.ml index 5f868cbf5ce6..91590c9fa8ae 100644 --- a/src/proto_alpha/lib_delegate/baking_scheduling.ml +++ b/src/proto_alpha/lib_delegate/baking_scheduling.ml @@ -531,9 +531,11 @@ let compute_next_timeout state : Baking_state.timeout_kind Lwt.t tzresult Lwt.t match round_proposer state ~level:`Current (snd next_round) with | Some _ -> let delta = - state.global_state.constants.parametric.minimal_block_delay - |> Period.to_seconds - |> fun d -> Int64.div d 5L + max + 1L + ( state.global_state.constants.parametric.minimal_block_delay + |> Period.to_seconds + |> fun d -> Int64.div d 5L ) in (* NB: this means 6 seconds delay, if the first round duration is 30. *) -- GitLab From ffbfc253181615f396fe155f3e20823bb0ef7368 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 15 Jan 2025 14:17:45 +0100 Subject: [PATCH 3/3] Tezt: Disable test [migrate_proxy_to_sequencer_future] --- etherlink/tezt/tests/evm_rollup.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etherlink/tezt/tests/evm_rollup.ml b/etherlink/tezt/tests/evm_rollup.ml index 2947e32d73b4..4b34a5a0f84a 100644 --- a/etherlink/tezt/tests/evm_rollup.ml +++ b/etherlink/tezt/tests/evm_rollup.ml @@ -4928,7 +4928,8 @@ let test_l2_timestamp_opcode = let test_migrate_proxy_to_sequencer_future = Protocol.register_test ~__FILE__ - ~tags:["evm"; "rollup_node"; "init"; "migration"; "sequencer"] + ~tags: + ["evm"; "rollup_node"; "init"; "migration"; "sequencer"; Tag.ci_disabled] ~uses:(fun _protocol -> [ Constant.octez_smart_rollup_node; -- GitLab