diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst
index b96705038a5d8cd52dc876ff71eb2d358e5f829b..c77369fd834fe6b86cb83ada22193542c70dd269 100644
--- a/docs/protocols/alpha.rst
+++ b/docs/protocols/alpha.rst
@@ -88,6 +88,68 @@ Cryptography
 Bug Fixes
 ---------
 
+15s Block Times (MR :gl:`!7017`)
+--------------------------------
+
+Blocks times have been reduced from 30 seconds to 15 seconds.
+That is, a block can be produced with a delay of 15 seconds with respect to the previous block, if both blocks have round 0.
+This change comes with updating many related protocol parameters in order to match the reduced block times.
+In particular, the following quantities are kept the same:
+
+- the minimal time period of a cycle (namely, 2 days, 20 hours, and 16 minutes),
+- the length of the nonce revelation period (namely, around 2 hours and 8 minutes)
+- the number of nonce commitments per cycle (namely, 128),
+- the number of stake snapshots per cycle (namely, 16),
+- the maximum rewards per minute (namely 80 tez), and therefore roughly the same inflation,
+- the minimal "time to live" of an operation (namely, 1 hour),
+- the block gas limit per minute (namely 10400000 gas),
+- the ratio between the liquidity baking subsidy and the maximum rewards per block (namely, 1/16).
+
+.. list-table:: Changes to protocol parameters
+   :widths: 50 25 25
+   :header-rows: 1
+
+   * - Parameter (unit)
+     - Old (Lima) value
+     - New value
+   * - ``minimal_block_delay`` (seconds)
+     - ``30``
+     - ``15``
+   * - ``delay_increment_per_round`` (seconds)
+     - ``15``
+     - ``8``
+   * - ``blocks_per_cycle`` (blocks)
+     - ``8192``
+     - ``16384``
+   * - ``blocks_per_commitment`` (blocks)
+     - ``64``
+     - ``128``
+   * - ``nonce_revelation_threshold`` (blocks)
+     - ``256``
+     - ``512``
+   * - ``blocks_per_stake_snapshot`` (blocks)
+     - ``512``
+     - ``1024``
+   * - ``max_operations_time_to_live`` (blocks)
+     - ``120``
+     - ``240``
+   * - ``hard_gas_limit_per_block`` (gas unit)
+     - ``5200000``
+     - ``2600000``
+   * - ``baking_reward_fixed_portion`` (mutez)
+     - ``10000000``
+     - ``5000000``
+   * - ``baking_reward_bonus_per_slot`` (mutez)
+     - ``4286``
+     - ``2143``
+   * - ``endorsing_reward_per_slot`` (mutez)
+     - ``2857``
+     - ``1428``
+   * - ``liquidity_baking_subsidy`` (mutez)
+     - ``2500000``
+     - ``1250000``
+
+
 Minor Changes
 -------------
 
diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml
index 77303428e78386560947404abab51a3886d80f88..e6a7a7e83825c24871b6f74eeecc4db2e6efae77 100644
--- a/src/proto_alpha/lib_parameters/default_parameters.ml
+++ b/src/proto_alpha/lib_parameters/default_parameters.ml
@@ -78,7 +78,7 @@ let default_dal =
 
 let constants_mainnet =
   let consensus_committee_size = 7000 in
-  let block_time = 30 in
+  let block_time = 15 in
   let Constants.Generated.
         {
           consensus_threshold;
@@ -93,18 +93,18 @@ let constants_mainnet =
   in
   {
     Constants.Parametric.preserved_cycles = 5;
-    blocks_per_cycle = 8192l;
-    blocks_per_commitment = 64l;
-    nonce_revelation_threshold = 256l;
-    blocks_per_stake_snapshot = 512l;
+    blocks_per_cycle = 16384l;
+    blocks_per_commitment = 128l;
+    nonce_revelation_threshold = 512l;
+    blocks_per_stake_snapshot = 1024l;
     cycles_per_voting_period = 5l;
     hard_gas_limit_per_operation = Gas.Arith.(integral_of_int_exn 1_040_000);
-    hard_gas_limit_per_block = Gas.Arith.(integral_of_int_exn 5_200_000);
+    hard_gas_limit_per_block = Gas.Arith.(integral_of_int_exn 2_600_000);
     proof_of_work_threshold = Int64.(sub (shift_left 1L 46) 1L);
     minimal_stake = Tez.(mul_exn one 6_000);
     (* VDF's difficulty must be a multiple of `nonce_revelation_threshold` times
        the block time. At the moment it is equal to 8B = 8000 * 5 * .2M with
-          - 8000 ~= 256 * 30 that is nonce_revelation_threshold * block time
+          - 8000 ~= 512 * 15 that is nonce_revelation_threshold * block time
           - .2M  ~= number of modular squaring per second on benchmark machine
          with 2.8GHz CPU
           - 5: security factor (strictly higher than the ratio between highest CPU
@@ -113,29 +113,29 @@ let constants_mainnet =
     seed_nonce_revelation_tip =
       (match Tez.(one /? 8L) with Ok c -> c | Error _ -> assert false);
     origination_size = 257;
-    baking_reward_fixed_portion (* 10_000_000 mutez *);
-    baking_reward_bonus_per_slot (* 4_286 mutez *);
-    endorsing_reward_per_slot (* 2_857 mutez *);
+    baking_reward_fixed_portion (* 5_000_000 mutez *);
+    baking_reward_bonus_per_slot (* 2_143 mutez *);
+    endorsing_reward_per_slot (* 1_428 mutez *);
     hard_storage_limit_per_operation = Z.of_int 60_000;
     cost_per_byte = Tez.of_mutez_exn 250L;
     quorum_min = 20_00l;
     quorum_max = 70_00l;
     min_proposal_quorum = 5_00l;
     (* liquidity_baking_subsidy is 1/16th of maximum total rewards for a block *)
-    liquidity_baking_subsidy (* 2_500_000 mutez *);
+    liquidity_baking_subsidy (* 1_250_000 mutez *);
     (* 1/2 window size of 2000 blocks with precision of 1_000_000
        for integer computation *)
     liquidity_baking_toggle_ema_threshold = 1_000_000_000l;
     (* The rationale behind the value of this constant is that an
        operation should be considered alive for about one hour:
 
-       minimal_block_delay context *  max_operations_ttl = 3600
+         minimal_block_delay * max_operations_time_to_live = 3600
 
        The unit for this value is a block.
     *)
-    max_operations_time_to_live = 120;
+    max_operations_time_to_live = 240;
     minimal_block_delay = Period.of_seconds_exn (Int64.of_int block_time);
-    delay_increment_per_round = Period.of_seconds_exn 15L;
+    delay_increment_per_round = Period.of_seconds_exn 8L;
     consensus_committee_size;
     consensus_threshold;
     (* 4667 slots *)
diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml
index c264222e881fabd11642c6129a217622af2885bd..77d3cf56ab1cb78ae8c9b1486bdd0f88a2b8f7dd 100644
--- a/src/proto_alpha/lib_protocol/raw_context.ml
+++ b/src/proto_alpha/lib_protocol/raw_context.ml
@@ -875,6 +875,82 @@ let[@warning "-32"] get_previous_protocol_constants ctxt =
              context."
       | Some constants -> Lwt.return constants)
 
+let update_block_time_related_constants (c : Constants_parametric_repr.t) =
+  let divide_period p =
+    Period_repr.of_seconds_exn
+      Int64.(div (add (Period_repr.to_seconds p) 1L) 2L)
+  in
+  let minimal_block_delay = divide_period c.minimal_block_delay in
+  let delay_increment_per_round = divide_period c.delay_increment_per_round in
+  let hard_gas_limit_per_block =
+    let two = Z.(succ one) in
+    Gas_limit_repr.Arith.(
+      integral_exn (Z.div (integral_to_z c.hard_gas_limit_per_block) two))
+  in
+  let Constants_repr.Generated.
+        {
+          consensus_threshold = _;
+          baking_reward_fixed_portion;
+          baking_reward_bonus_per_slot;
+          endorsing_reward_per_slot;
+          liquidity_baking_subsidy;
+        } =
+    Constants_repr.Generated.generate
+      ~consensus_committee_size:
+        c.Constants_parametric_repr.consensus_committee_size
+      ~blocks_per_minute:
+        {
+          numerator = 60;
+          denominator =
+            minimal_block_delay |> Period_repr.to_seconds |> Int64.to_int;
+        }
+  in
+  let double = Int32.mul 2l in
+  let blocks_per_cycle = double c.blocks_per_cycle in
+  let blocks_per_commitment = double c.blocks_per_commitment in
+  let nonce_revelation_threshold = double c.nonce_revelation_threshold in
+  let blocks_per_stake_snapshot = double c.blocks_per_stake_snapshot in
+  let max_operations_time_to_live = 2 * c.max_operations_time_to_live in
+  {
+    c with
+    blocks_per_cycle;
+    blocks_per_commitment;
+    nonce_revelation_threshold;
+    blocks_per_stake_snapshot;
+    max_operations_time_to_live;
+    minimal_block_delay;
+    delay_increment_per_round;
+    hard_gas_limit_per_block;
+    baking_reward_fixed_portion;
+    baking_reward_bonus_per_slot;
+    endorsing_reward_per_slot;
+    liquidity_baking_subsidy;
+  }
+
+let update_cycle_eras ctxt level ~prev_blocks_per_cycle ~blocks_per_cycle
+    ~blocks_per_commitment =
+  get_cycle_eras ctxt >>=? fun cycle_eras ->
+  let current_era = Level_repr.current_era cycle_eras in
+  let current_cycle =
+    let level_position =
+      Int32.sub level (Raw_level_repr.to_int32 current_era.first_level)
+    in
+    Cycle_repr.add
+      current_era.first_cycle
+      (Int32.to_int (Int32.div level_position prev_blocks_per_cycle))
+  in
+  let new_cycle_era =
+    Level_repr.
+      {
+        first_level = Raw_level_repr.of_int32_exn (Int32.succ level);
+        first_cycle = Cycle_repr.succ current_cycle;
+        blocks_per_cycle;
+        blocks_per_commitment;
+      }
+  in
+  Level_repr.add_cycle_era new_cycle_era cycle_eras >>?= fun new_cycle_eras ->
+  set_cycle_eras ctxt new_cycle_eras
+
 (* You should ensure that if the type `Constants_parametric_repr.t` is
    different from `Constants_parametric_previous_repr.t` or the value of these
    constants is modified, is changed from the previous protocol, then
@@ -1025,6 +1101,20 @@ let prepare_first_block ~level ~timestamp ctxt =
             zk_rollup;
           }
       in
+      let block_time_is_at_least_15s =
+        Compare.Int64.(Period_repr.to_seconds c.minimal_block_delay >= 15L)
+      in
+      (if block_time_is_at_least_15s then
+       let new_constants = update_block_time_related_constants constants in
+       update_cycle_eras
+         ctxt
+         level
+         ~prev_blocks_per_cycle:constants.blocks_per_cycle
+         ~blocks_per_cycle:new_constants.blocks_per_cycle
+         ~blocks_per_commitment:new_constants.blocks_per_commitment
+       >>=? fun ctxt -> return (ctxt, new_constants)
+      else return (ctxt, constants))
+      >>=? fun (ctxt, constants) ->
       add_constants ctxt constants >>= fun ctxt -> return ctxt)
   >>=? fun ctxt ->
   prepare ctxt ~level ~predecessor_timestamp:timestamp ~timestamp
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_wasm.ml b/src/proto_alpha/lib_protocol/sc_rollup_wasm.ml
index 689131b6678604e8075c088ca5372bd8aaaa2361..30df0dfbe716378b82186431895161457bd67150 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_wasm.ml
+++ b/src/proto_alpha/lib_protocol/sc_rollup_wasm.ml
@@ -83,7 +83,7 @@ let () =
 module V2_0_0 = struct
   let ticks_per_snapshot = Z.of_int64 11_000_000_000L
 
-  let outbox_validity_period = Int32.of_int 40_320
+  let outbox_validity_period = Int32.of_int 80_640
 
   let outbox_message_limit = Z.of_int 100
 
diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_levels.ml b/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_levels.ml
index 78100c3c5f81d77c29832749ac2bfca1c18808e7..a6e799c846db0c4afdc75c8da84a3c715abfb012 100644
--- a/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_levels.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_levels.ml
@@ -404,12 +404,12 @@ let make_batch_test_block_one_origination name contract gas_sampler =
 
 (** Tests the consumption of all gas in a block, should pass *)
 let test_consume_exactly_all_block_gas () =
-  let number_of_ops = 5 in
+  let number_of_ops = 2 in
   block_with_one_origination number_of_ops nil_contract
   >>=? fun (block, src_list, dst) ->
   (* assumptions:
-     hard gas limit per operation = 1040000
-     hard gas limit per block = 5200000
+     hard gas limit per operation = 1_040_000
+     hard gas limit per block = 2_600_000
   *)
   let lld =
     List.map
diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
index 26e78f570d3b807c9731fdad2b4576cde32af5d7..39cc727bfab7e2b42900c1d0178709baf5211057 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
@@ -215,7 +215,7 @@ let context_init ?(tx_rollup_max_inboxes_count = 2100)
     ?(tx_rollup_max_ticket_payload_size = 10_240)
     ?(tx_rollup_finality_period = 1) ?(tx_rollup_origination_size = 60_000)
     ?(cost_per_byte = Tez.zero) ?(tx_rollup_hard_size_limit_per_message = 5_000)
-    tup =
+    ?(tx_max_messages_per_inbox = 1010) tup =
   Context.init_with_constants_gen
     tup
     {
@@ -234,6 +234,7 @@ let context_init ?(tx_rollup_max_inboxes_count = 2100)
           max_inboxes_count = tx_rollup_max_inboxes_count;
           hard_size_limit_per_message = tx_rollup_hard_size_limit_per_message;
           max_ticket_payload_size = tx_rollup_max_ticket_payload_size;
+          max_messages_per_inbox = tx_max_messages_per_inbox;
         };
       endorsing_reward_per_slot = Tez.zero;
       baking_reward_bonus_per_slot = Tez.zero;
@@ -247,7 +248,7 @@ let context_init ?(tx_rollup_max_inboxes_count = 2100)
 let context_init1 ?tx_rollup_max_inboxes_count
     ?tx_rollup_max_ticket_payload_size ?tx_rollup_rejection_max_proof_size
     ?tx_rollup_finality_period ?tx_rollup_origination_size ?cost_per_byte
-    ?tx_rollup_hard_size_limit_per_message () =
+    ?tx_rollup_hard_size_limit_per_message ?tx_max_messages_per_inbox () =
   context_init
     ?tx_rollup_max_inboxes_count
     ?tx_rollup_max_ticket_payload_size
@@ -256,6 +257,7 @@ let context_init1 ?tx_rollup_max_inboxes_count
     ?tx_rollup_origination_size
     ?cost_per_byte
     ?tx_rollup_hard_size_limit_per_message
+    ?tx_max_messages_per_inbox
     Context.T1
 
 (** [context_init2] initializes a context with no consensus rewards
@@ -995,7 +997,7 @@ let test_inbox_size_too_big () =
 
 (** Try to add enough batches to reach the batch count limit of an inbox. *)
 let test_inbox_count_too_big () =
-  context_init1 () >>=? fun (b, contract) ->
+  context_init1 ~tx_max_messages_per_inbox:505 () >>=? fun (b, contract) ->
   let _, _, pkh = gen_l2_account () in
   Context.get_constants (B b) >>=? fun constant ->
   let message_count = constant.parametric.tx_rollup.max_messages_per_inbox in
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out
index acfd98be9d76b2edb3ebcd939032c1728b6c28e0..9791c9158c851d31163525f4256e09ff434076f2 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out	
@@ -12,7 +12,7 @@
   "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",
+  "hard_gas_limit_per_block": "2600000", "proof_of_work_threshold": "-1",
   "minimal_stake": "6000000000", "vdf_difficulty": "50000",
   "seed_nonce_revelation_tip": "125000", "origination_size": 257,
   "baking_reward_fixed_portion": "333333",
@@ -22,7 +22,7 @@
   "quorum_max": 7000, "min_proposal_quorum": 500,
   "liquidity_baking_subsidy": "83333",
   "liquidity_baking_toggle_ema_threshold": 1000000000,
-  "max_operations_time_to_live": 120, "minimal_block_delay": "1",
+  "max_operations_time_to_live": 240, "minimal_block_delay": "1",
   "delay_increment_per_round": "1", "consensus_committee_size": 256,
   "consensus_threshold": 0,
   "minimal_participation_ratio": { "numerator": 2, "denominator": 3 },
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out
index e872235b0700623698007256230267a82e918795..94771e38790eaca2e0306bffd06336aad618c5c7 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out	
@@ -12,7 +12,7 @@
   "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",
+  "hard_gas_limit_per_block": "2600000", "proof_of_work_threshold": "-1",
   "minimal_stake": "6000000000", "vdf_difficulty": "50000",
   "seed_nonce_revelation_tip": "125000", "origination_size": 257,
   "baking_reward_fixed_portion": "333333",
@@ -22,7 +22,7 @@
   "quorum_max": 7000, "min_proposal_quorum": 500,
   "liquidity_baking_subsidy": "83333",
   "liquidity_baking_toggle_ema_threshold": 1000000000,
-  "max_operations_time_to_live": 120, "minimal_block_delay": "1",
+  "max_operations_time_to_live": 240, "minimal_block_delay": "1",
   "delay_increment_per_round": "1", "consensus_committee_size": 256,
   "consensus_threshold": 0,
   "minimal_participation_ratio": { "numerator": 2, "denominator": 3 },
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out
index 4b2159c277e55141288f50ab4c408be25414fe74..9d57a015a3737eaf30e6c56239a69d9d38f66820 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out	
@@ -12,7 +12,7 @@
   "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",
+  "hard_gas_limit_per_block": "2600000", "proof_of_work_threshold": "-1",
   "minimal_stake": "6000000000", "vdf_difficulty": "50000",
   "seed_nonce_revelation_tip": "125000", "origination_size": 257,
   "baking_reward_fixed_portion": "333333",
@@ -22,7 +22,7 @@
   "quorum_max": 7000, "min_proposal_quorum": 500,
   "liquidity_baking_subsidy": "83333",
   "liquidity_baking_toggle_ema_threshold": 1000000000,
-  "max_operations_time_to_live": 120, "minimal_block_delay": "1",
+  "max_operations_time_to_live": 240, "minimal_block_delay": "1",
   "delay_increment_per_round": "1", "consensus_committee_size": 256,
   "consensus_threshold": 0,
   "minimal_participation_ratio": { "numerator": 2, "denominator": 3 },
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out
index d204aeca566ba813bf7751d1306acbdd9d644dfc..1b08b3512c50b2c71265e7d02d886b8919f792e7 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out	
@@ -12,7 +12,7 @@
   "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",
+  "hard_gas_limit_per_block": "2600000", "proof_of_work_threshold": "-1",
   "minimal_stake": "6000000000", "vdf_difficulty": "50000",
   "seed_nonce_revelation_tip": "125000", "origination_size": 257,
   "baking_reward_fixed_portion": "333333",
@@ -22,7 +22,7 @@
   "quorum_max": 7000, "min_proposal_quorum": 500,
   "liquidity_baking_subsidy": "83333",
   "liquidity_baking_toggle_ema_threshold": 1000000000,
-  "max_operations_time_to_live": 120, "minimal_block_delay": "1",
+  "max_operations_time_to_live": 240, "minimal_block_delay": "1",
   "delay_increment_per_round": "1", "consensus_committee_size": 256,
   "consensus_threshold": 0,
   "minimal_participation_ratio": { "numerator": 2, "denominator": 3 },
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out
index d204aeca566ba813bf7751d1306acbdd9d644dfc..1b08b3512c50b2c71265e7d02d886b8919f792e7 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out	
@@ -12,7 +12,7 @@
   "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",
+  "hard_gas_limit_per_block": "2600000", "proof_of_work_threshold": "-1",
   "minimal_stake": "6000000000", "vdf_difficulty": "50000",
   "seed_nonce_revelation_tip": "125000", "origination_size": 257,
   "baking_reward_fixed_portion": "333333",
@@ -22,7 +22,7 @@
   "quorum_max": 7000, "min_proposal_quorum": 500,
   "liquidity_baking_subsidy": "83333",
   "liquidity_baking_toggle_ema_threshold": 1000000000,
-  "max_operations_time_to_live": 120, "minimal_block_delay": "1",
+  "max_operations_time_to_live": 240, "minimal_block_delay": "1",
   "delay_increment_per_round": "1", "consensus_committee_size": 256,
   "consensus_threshold": 0,
   "minimal_participation_ratio": { "numerator": 2, "denominator": 3 },
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out
index e7e048a08d6dc508c56bd6c4c9c44e77d0089626..5b1a7b81e6a6482d37ceab81a68dfdb04aaed605 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out	
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.351
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002aed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374caed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374c0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b9aed9197285014e13f545e6fb83b2cd3490202fc87744566becf1bd433546374c0000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002de2a6a7b33c40b134eac6acb678fecdb8fd6f53c81ede260d97b75fc47678273de2a6a7b33c40b134eac6acb678fecdb8fd6f53c81ede260d97b75fc476782730005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b9de2a6a7b33c40b134eac6acb678fecdb8fd6f53c81ede260d97b75fc476782730000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 5939.006 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out
index a2306c561aaa3691dfb3c3011c7e0d185cfaee02..15378aca5f95df6e28af45d7fae9c1401ab1e29a 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out	
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.633
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000218e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd718e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd70005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0518e2f064b01c59ff40b40450d8cc5dd53fc083cab1b77eea031361354d58dbd70000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002e9fbe2621630db520ce9c140c23d5827f5af908d3de5c84009188381eeb95c55e9fbe2621630db520ce9c140c23d5827f5af908d3de5c84009188381eeb95c550005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb05e9fbe2621630db520ce9c140c23d5827f5af908d3de5c84009188381eeb95c550000000500000000001f002501c00c5e4e94a48a49e267873112bbe3cf3373be5b0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 5937.998 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out
index c50fbabb7d5e11e3783350fa2e05606539d06b40..899e10d239a9e00d92cc651fa3c5d1ed2d1155ed 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out	
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.364
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300022e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a42e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a40005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c09998e976abfc21a341c09b7a0d7f7bf2874b4185b5b68f82f861a0b8ffb3ff6a820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b92e01ded8b469e787295b0058c2c776f81b12d997be05ebbdcb7c8f2a78b931a400000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300021abf4bc11e9834589b70783b5c827275bb13fefcb739adeb2cc1655e7d432d301abf4bc11e9834589b70783b5c827275bb13fefcb739adeb2cc1655e7d432d300005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b91abf4bc11e9834589b70783b5c827275bb13fefcb739adeb2cc1655e7d432d3000000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 5939.188 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out
index 3a07034a5c56a97b2ae81e4c60039425eaa431b2..003600f28ce5bd25a3fdbea537f230a2ddb29099 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out	
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.633
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000220b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe20b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c08438b3f8243870868b2649ea870eca2ae2a9cbc0d27b934508c8dfe7e9f2b6f3820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400009d8082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0520b53f5f46bab46423a44008055cca2d5481ae52792e9e05c2ebb6d2dbb7c1fe00000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002eac20835ed3dd2587ec2118b03cba15a8aed2e86ce5cd04fa6b09bc7eb197978eac20835ed3dd2587ec2118b03cba15a8aed2e86ce5cd04fa6b09bc7eb1979780005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb05eac20835ed3dd2587ec2118b03cba15a8aed2e86ce5cd04fa6b09bc7eb19797800000005000000000023002501c00c5e4e94a48a49e267873112bbe3cf3373be5b000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 5938.180 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/protocol_migration.ml b/tezt/tests/protocol_migration.ml
index ea85c3e45dc026f55a17531e40b03fad6b8145b5..b88bf714f3024c8dc0ef7e71b52de001057fcdfb 100644
--- a/tezt/tests/protocol_migration.ml
+++ b/tezt/tests/protocol_migration.ml
@@ -82,7 +82,7 @@ let perform_protocol_migration ?node_name ?client_name ~blocks_per_cycle
   in
   Log.info "Node %s initialized" (Node.name node) ;
   let* () = Client.activate_protocol ~protocol:migrate_from client in
-  Log.info "Protocol activated" ;
+  Log.info "Protocol %s activated" (Protocol.hash migrate_from) ;
   (* Bake until migration *)
   let* () =
     repeat (migration_level - 1) (fun () -> Client.bake_for_and_wait client)