From 56d88b2d8717a717dba0392e03bbee822e80cc16 Mon Sep 17 00:00:00 2001
From: Lucas Randazzo <lucas@nomadic-labs.com>
Date: Tue, 7 Oct 2025 14:47:26 +0200
Subject: [PATCH 1/2] sandbox abaab threshold = 0

---
 src/proto_alpha/lib_parameters/default_parameters.ml | 1 +
 tezt/tests/dal.ml                                    | 2 +-
 tezt/tests/double_consensus.ml                       | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml
index 521d880f215f..ae720b8ef1d1 100644
--- a/src/proto_alpha/lib_parameters/default_parameters.ml
+++ b/src/proto_alpha/lib_parameters/default_parameters.ml
@@ -462,6 +462,7 @@ let constants_sandbox =
     limit_of_delegation_over_baking = 19;
     max_operations_time_to_live = 8;
     allow_tz4_delegate_enable = true;
+    all_bakers_attest_activation_threshold = {numerator = 0; denominator = 1};
   }
 
 let constants_test =
diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml
index 70f0a38b5f7b..3475532ec9ec 100644
--- a/tezt/tests/dal.ml
+++ b/tezt/tests/dal.ml
@@ -590,7 +590,7 @@ let with_layer1 ?custom_constants ?additional_bootstrap_accounts
                 passed explicitly as a parameter override. *)
              [
                ( ["all_bakers_attest_activation_threshold"],
-                 `O [("numerator", `Float 2.); ("denominator", `Float 1.)] );
+                 `O [("numerator", `Float 0.); ("denominator", `Float 1.)] );
              ]
          | Some Q.{num; den} ->
              [
diff --git a/tezt/tests/double_consensus.ml b/tezt/tests/double_consensus.ml
index b8672f5bb684..4638079cf934 100644
--- a/tezt/tests/double_consensus.ml
+++ b/tezt/tests/double_consensus.ml
@@ -551,7 +551,7 @@ let attestation_and_aggregation_wrong_payload_hash =
       if Protocol.(number protocol >= 024) then
         [
           ( ["all_bakers_attest_activation_threshold"],
-            `O [("numerator", `Float 2.); ("denominator", `Float 1.)] );
+            `O [("numerator", `Float 0.); ("denominator", `Float 2.)] );
         ]
       else [])
   in
@@ -671,7 +671,7 @@ let double_aggregation_wrong_payload_hash =
       if Protocol.(number protocol >= 024) then
         [
           ( ["all_bakers_attest_activation_threshold"],
-            `O [("numerator", `Float 2.); ("denominator", `Float 1.)] );
+            `O [("numerator", `Float 0.); ("denominator", `Float 1.)] );
         ]
       else [])
   in
@@ -851,7 +851,7 @@ let preattestation_and_aggregation_wrong_payload_hash =
       if Protocol.(number protocol >= 024) then
         [
           ( ["all_bakers_attest_activation_threshold"],
-            `O [("numerator", `Float 2.); ("denominator", `Float 1.)] );
+            `O [("numerator", `Float 0.); ("denominator", `Float 1.)] );
         ]
       else [])
   in
@@ -1004,7 +1004,7 @@ let double_preattestation_aggregation_wrong_payload_hash =
       if Protocol.(number protocol >= 024) then
         [
           ( ["all_bakers_attest_activation_threshold"],
-            `O [("numerator", `Float 2.); ("denominator", `Float 1.)] );
+            `O [("numerator", `Float 0.); ("denominator", `Float 1.)] );
         ]
       else [])
   in
-- 
GitLab


From 8b8706dc515e91d7c0a8c1df45df204f7019403f Mon Sep 17 00:00:00 2001
From: Lucas Randazzo <lucas@nomadic-labs.com>
Date: Fri, 31 Oct 2025 15:21:01 +0100
Subject: [PATCH 2/2] regressions

---
 ...r the FA deposit and withdrawal events.out | 10 +--
 ... test for the claimed FA deposit event.out |  2 +-
 ...lient) RPC regression tests- delegates.out |  2 +-
 ...t) RPC regression tests- misc_protocol.out | 10 +--
 ...de client) RPC regression tests- votes.out |  6 +-
 ...light) RPC regression tests- delegates.out |  2 +-
 ...t) RPC regression tests- misc_protocol.out | 10 +--
 ...ode light) RPC regression tests- votes.out |  6 +-
 ...proxy) RPC regression tests- delegates.out |  2 +-
 ...y) RPC regression tests- misc_protocol.out | 10 +--
 ...ode proxy) RPC regression tests- votes.out |  6 +-
 ... - delegate - consensus - destination).out | 72 +++++++++----------
 ...- delegate - consensus -- destination).out | 70 +++++++++---------
 ...-- delegate - consensus - destination).out | 72 +++++++++----------
 ...- delegate - consensus -- destination).out | 70 +++++++++---------
 ... set consensus key - baker is delegate.out | 20 +++---
 ... consensus key - baker is not delegate.out | 20 +++---
 ... integration (Use all available slots).out | 10 +--
 .../Alpha- Send tickets in bigmap.out         |  8 +--
 19 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the FA deposit and withdrawal events.out b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the FA deposit and withdrawal events.out
index 6d584fa9407f..744a982a90cf 100644
--- a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the FA deposit and withdrawal events.out	
+++ b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the FA deposit and withdrawal events.out	
@@ -3,19 +3,19 @@
 Address: 0xff00000000000000000000000000000000000002
 Topics:
 - 0x7ee7a1de9c18ce695c95b8b19fbdf26cce3544e3ca9e08c9f487776783d7599f
-- 0x78342aed669a8f837eb3509c2f2b786109aca680545c5b8c5400dd9483fb6dba
+- 0xd6e07267774e21cd19aaac59e05ca34854567fafdb0e3aa107bdd04859cd2789
 Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002
 # FA Withdrawal
 ## Log 0
 Address: 0xff00000000000000000000000000000000000002
 Topics:
 - 0xab68450c9e546f6062a861eebf8ec5bbd41b4425e26b20199c91227c7f9038ca
-- 0x78342aed669a8f837eb3509c2f2b786109aca680545c5b8c5400dd9483fb6dba
-Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c000000000000000000000000000000000000000000000000000000000000000001df2cc9eaa68fec5546e3878c0c4ed51c5e6fa17d000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000
+- 0xd6e07267774e21cd19aaac59e05ca34854567fafdb0e3aa107bdd04859cd2789
+Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c00000000000000000000000000000000000000000000000000000000000000000168e95ba7305278b964d3246c2708dfce6c74970d000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000
 # FA Fast Withdrawal
 ## Log 0
 Address: 0xff00000000000000000000000000000000000002
 Topics:
 - 0x7e40c982e82bccb5e8bbd29f38bcfa3996f341ef9f51e2a9cffe086ec87a11c7
-- 0x78342aed669a8f837eb3509c2f2b786109aca680545c5b8c5400dd9483fb6dba
-Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000c55cf02dbeecc978d9c84625dcae72bb77ea4fbd0000000000000000000001df2cc9eaa68fec5546e3878c0c4ed51c5e6fa17d000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000005e0be103000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001
+- 0xd6e07267774e21cd19aaac59e05ca34854567fafdb0e3aa107bdd04859cd2789
+Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000c55cf02dbeecc978d9c84625dcae72bb77ea4fbd000000000000000000000168e95ba7305278b964d3246c2708dfce6c74970d000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000005e0be103000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001
diff --git a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the claimed FA deposit event.out b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the claimed FA deposit event.out
index b947064d9020..fbcd4f606f5e 100644
--- a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the claimed FA deposit event.out	
+++ b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Regression test for the claimed FA deposit event.out	
@@ -11,5 +11,5 @@ Data: 0x000000000000000000000000000000000000000000000000000000000000000000000000
 Address: 0xff00000000000000000000000000000000000002
 Topics:
 - 0x7ee7a1de9c18ce695c95b8b19fbdf26cce3544e3ca9e08c9f487776783d7599f
-- 0xbd72d6debb169f6b136953b7f28dc058ce72e2c4aa9de14a588a311b11693a33
+- 0xfaa23a74b6ea94937583cbd7e819fc84277c392547ea2e6675cbead87e2a56bb
 Data: 0x000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000003
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out
index cbaa5f5251f3..262d6e568b9f 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out	
@@ -22,7 +22,7 @@
     { "expected_cycle_activity": 409, "minimal_cycle_activity": 272,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 137,
-      "expected_attesting_rewards": "958287" },
+      "expected_attesting_rewards": "960032" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 409,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
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 d2c69b16e7a6..b9402bbdd3c2 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	
@@ -82,7 +82,7 @@
   "direct_ticket_spending_enable": false, "aggregate_attestation": true,
   "allow_tz4_delegate_enable": true,
   "all_bakers_attest_activation_threshold":
-    { "numerator": 1, "denominator": 2 }, "issuance_modification_delay": 2,
+    { "numerator": 0, "denominator": 1 }, "issuance_modification_delay": 2,
   "consensus_key_activation_delay": 2, "unstake_finalization_delay": 3 }
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/baking_rights
@@ -118,16 +118,16 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 4, "attesting_power": 55,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 4, "attesting_power": 47,
+          "first_slot": 3, "attesting_power": 47,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 2, "attesting_power": 46,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 1, "attesting_power": 55,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 0, "attesting_power": 58,
@@ -137,7 +137,7 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" } ] } ]
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/levels_in_current_cycle
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out
index eaefa3fd4782..9aa8a0052e88 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out	
@@ -43,7 +43,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ]
 
 ./octez-client rpc get /chains/main/blocks/head/votes/ballots
-{ "yay": "4000001617576", "nay": "4000000000000", "pass": "4000000000000" }
+{ "yay": "4000001606130", "nay": "4000000000000", "pass": "4000000000000" }
 
 ./octez-client rpc get /chains/main/blocks/head/votes/current_period
 { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 },
@@ -65,7 +65,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]",
     "voting_power": "4000000000000" },
   { "pkh": "[PUBLIC_KEY_HASH]",
-    "voting_power": "4000001617576" } ]
+    "voting_power": "4000001606130" } ]
 
 ./octez-client rpc get /chains/main/blocks/head/votes/proposals
 []
@@ -75,4 +75,4 @@ null
   "position": 1, "remaining": 2 }
 
 ./octez-client rpc get /chains/main/blocks/head/votes/total_voting_power
-"20000001617576"
+"20000001606130"
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out
index 8bb3a697b4a0..9bac93e99494 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out	
@@ -22,7 +22,7 @@
     { "expected_cycle_activity": 409, "minimal_cycle_activity": 272,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 137,
-      "expected_attesting_rewards": "958287" },
+      "expected_attesting_rewards": "960032" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 409,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
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 200957652ad1..ad52edcef3e2 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	
@@ -82,7 +82,7 @@
   "direct_ticket_spending_enable": false, "aggregate_attestation": true,
   "allow_tz4_delegate_enable": true,
   "all_bakers_attest_activation_threshold":
-    { "numerator": 1, "denominator": 2 }, "issuance_modification_delay": 2,
+    { "numerator": 0, "denominator": 1 }, "issuance_modification_delay": 2,
   "consensus_key_activation_delay": 2, "unstake_finalization_delay": 3 }
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/helpers/baking_rights
@@ -118,16 +118,16 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 4, "attesting_power": 55,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 4, "attesting_power": 47,
+          "first_slot": 3, "attesting_power": 47,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 2, "attesting_power": 46,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 1, "attesting_power": 55,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 0, "attesting_power": 58,
@@ -137,7 +137,7 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" } ] } ]
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/helpers/levels_in_current_cycle
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out
index a7163e59c84d..e937f0a88ab9 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out	
@@ -43,7 +43,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ]
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/votes/ballots
-{ "yay": "4000001617576", "nay": "4000000000000", "pass": "4000000000000" }
+{ "yay": "4000001606130", "nay": "4000000000000", "pass": "4000000000000" }
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/votes/current_period
 { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 },
@@ -65,7 +65,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]",
     "voting_power": "4000000000000" },
   { "pkh": "[PUBLIC_KEY_HASH]",
-    "voting_power": "4000001617576" } ]
+    "voting_power": "4000001606130" } ]
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/votes/proposals
 []
@@ -75,4 +75,4 @@ null
   "position": 1, "remaining": 2 }
 
 ./octez-client --mode light rpc get /chains/main/blocks/head/votes/total_voting_power
-"20000001617576"
+"20000001606130"
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out
index 1f9cd7583277..2edb691fce8b 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out	
@@ -22,7 +22,7 @@
     { "expected_cycle_activity": 409, "minimal_cycle_activity": 272,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 137,
-      "expected_attesting_rewards": "958287" },
+      "expected_attesting_rewards": "960032" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 409,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
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 801519b5a9d8..4cdffc73aed7 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	
@@ -82,7 +82,7 @@
   "direct_ticket_spending_enable": false, "aggregate_attestation": true,
   "allow_tz4_delegate_enable": true,
   "all_bakers_attest_activation_threshold":
-    { "numerator": 1, "denominator": 2 }, "issuance_modification_delay": 2,
+    { "numerator": 0, "denominator": 1 }, "issuance_modification_delay": 2,
   "consensus_key_activation_delay": 2, "unstake_finalization_delay": 3 }
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/helpers/baking_rights
@@ -118,16 +118,16 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 4, "attesting_power": 55,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 4, "attesting_power": 47,
+          "first_slot": 3, "attesting_power": 47,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 2, "attesting_power": 46,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 1, "attesting_power": 55,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" },
         { "delegate": "[PUBLIC_KEY_HASH]",
           "first_slot": 0, "attesting_power": 58,
@@ -137,7 +137,7 @@
 [ { "level": 1,
     "delegates":
       [ { "delegate": "[PUBLIC_KEY_HASH]",
-          "first_slot": 11, "attesting_power": 50,
+          "first_slot": 1, "attesting_power": 50,
           "consensus_key": "[PUBLIC_KEY_HASH]" } ] } ]
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/helpers/levels_in_current_cycle
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out
index d6752ef73182..21d963f343fa 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out	
@@ -43,7 +43,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ]
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/ballots
-{ "yay": "4000001617576", "nay": "4000000000000", "pass": "4000000000000" }
+{ "yay": "4000001606130", "nay": "4000000000000", "pass": "4000000000000" }
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/current_period
 { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 },
@@ -65,7 +65,7 @@ null
   { "pkh": "[PUBLIC_KEY_HASH]",
     "voting_power": "4000000000000" },
   { "pkh": "[PUBLIC_KEY_HASH]",
-    "voting_power": "4000001617576" } ]
+    "voting_power": "4000001606130" } ]
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/proposals
 []
@@ -75,4 +75,4 @@ null
   "position": 1, "remaining": 2 }
 
 ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/total_voting_power
-"20000001617576"
+"20000001606130"
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out
index eb0a97ec31e9..39e1b06b31c0 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667657786",
-  "total_staked": "200000419200", "total_delegated": "3800002654865",
+  "pending_staking_parameters": [], "baking_power": "1466667648073",
+  "total_staked": "200000415398", "total_delegated": "3800002630780",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001715759",
+    { "amount": "3800001698026",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000003074065", "own_staked": "200000419200",
-  "own_delegated": "3800002654865", "external_staked": "0",
+  "own_full_balance": "4000003046178", "own_staked": "200000415398",
+  "own_delegated": "3800002630780", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000003074065",
+  "staking_denominator": "0", "current_voting_power": "4000003046178",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,7 +149,7 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000419200" } ],
+        "frozen_deposits": "200000415398" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]'
@@ -158,7 +158,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -167,20 +167,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667657786",
-  "total_staked": "200000419200", "total_delegated": "3800002654865",
+  "pending_staking_parameters": [], "baking_power": "1466667648073",
+  "total_staked": "200000415398", "total_delegated": "3800002630780",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001715759",
+    { "amount": "3800001698026",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000003074065", "own_staked": "200000419200",
-  "own_delegated": "3800002654865", "external_staked": "0",
+  "own_full_balance": "4000003046178", "own_staked": "200000415398",
+  "own_delegated": "3800002630780", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000003074065",
+  "staking_denominator": "0", "current_voting_power": "4000003046178",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -191,11 +191,11 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000419200" } ],
+        "frozen_deposits": "200000415398" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3800002654865"
+"3800002630780"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
@@ -219,17 +219,17 @@ This sequence of operations was run:
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.06425
       storage fees ........................... +ꜩ0.06425
-      [PUBLIC_KEY_HASH] ... -ꜩ3762002.564709
-      [PUBLIC_KEY_HASH] ... +ꜩ3762002.564709
-      [PUBLIC_KEY_HASH] ... -ꜩ38000.025906
-      [PUBLIC_KEY_HASH] ... +ꜩ38000.025906
+      [PUBLIC_KEY_HASH] ... -ꜩ3762002.540865
+      [PUBLIC_KEY_HASH] ... +ꜩ3762002.540865
+      [PUBLIC_KEY_HASH] ... -ꜩ38000.025665
+      [PUBLIC_KEY_HASH] ... +ꜩ38000.025665
 
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info
-[ "7333333553913",
+[ "7333333552352",
   [ [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
-      "1466666887249" ],
+      "1466666885688" ],
     [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
       "1466666666666" ],
@@ -249,7 +249,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 59, "missed_levels": 1,
       "remaining_allowed_missed_slots": 9,
-      "expected_attesting_rewards": "12444" },
+      "expected_attesting_rewards": "12557" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -258,21 +258,21 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "212667097831",
-  "total_staked": "200000420271", "total_delegated": "38000032682",
+  "pending_staking_parameters": [], "baking_power": "212667093949",
+  "total_staked": "200000416469", "total_delegated": "38000032441",
   "min_delegated_in_current_cycle":
-    { "amount": "38000032682",
+    { "amount": "38000032441",
       "level":
         { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "238000452953", "own_staked": "200000420271",
-  "own_delegated": "38000032682", "external_staked": "0",
+  "own_full_balance": "238000448910", "own_staked": "200000416469",
+  "own_delegated": "38000032441", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" },
       { "cycle": 2, "deposit": "0" } ], "denunciations": [],
   "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0",
-  "current_voting_power": "238000452953", "voting_power": "4000000000000",
+  "current_voting_power": "238000448910", "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
   "consensus_key":
@@ -282,14 +282,14 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000420271" } ],
+        "frozen_deposits": "200000416469" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"38000032682"
+"38000032441"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002564709"
+"3762002540865"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002564709"
+"3762002540865"
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out
index 61839ead13d4..483f1b87ad61 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667657786",
-  "total_staked": "200000419200", "total_delegated": "3800002654865",
+  "pending_staking_parameters": [], "baking_power": "1466667648073",
+  "total_staked": "200000415398", "total_delegated": "3800002630780",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001715759",
+    { "amount": "3800001698026",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000003074065", "own_staked": "200000419200",
-  "own_delegated": "3800002654865", "external_staked": "0",
+  "own_full_balance": "4000003046178", "own_staked": "200000415398",
+  "own_delegated": "3800002630780", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000003074065",
+  "staking_denominator": "0", "current_voting_power": "4000003046178",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,7 +149,7 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000419200" } ],
+        "frozen_deposits": "200000415398" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]'
@@ -158,7 +158,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -167,20 +167,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667657786",
-  "total_staked": "200000419200", "total_delegated": "3800002654865",
+  "pending_staking_parameters": [], "baking_power": "1466667648073",
+  "total_staked": "200000415398", "total_delegated": "3800002630780",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001715759",
+    { "amount": "3800001698026",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000003074065", "own_staked": "200000419200",
-  "own_delegated": "3800002654865", "external_staked": "0",
+  "own_full_balance": "4000003046178", "own_staked": "200000415398",
+  "own_delegated": "3800002630780", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000003074065",
+  "staking_denominator": "0", "current_voting_power": "4000003046178",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -191,11 +191,11 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000419200" } ],
+        "frozen_deposits": "200000415398" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3800002654865"
+"3800002630780"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
@@ -219,17 +219,17 @@ This sequence of operations was run:
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.06425
       storage fees ........................... +ꜩ0.06425
-      [PUBLIC_KEY_HASH] ... -ꜩ3762002.564709
-      [PUBLIC_KEY_HASH] ... +ꜩ3762002.564709
-      [PUBLIC_KEY_HASH] ... -ꜩ38000.025906
-      [PUBLIC_KEY_HASH] ... +ꜩ38000.025906
+      [PUBLIC_KEY_HASH] ... -ꜩ3762002.540865
+      [PUBLIC_KEY_HASH] ... +ꜩ3762002.540865
+      [PUBLIC_KEY_HASH] ... -ꜩ38000.025665
+      [PUBLIC_KEY_HASH] ... +ꜩ38000.025665
 
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info
-[ "7333333553913",
+[ "7333333552352",
   [ [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
-      "1466666887249" ],
+      "1466666885688" ],
     [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
       "1466666666666" ],
@@ -249,7 +249,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 59, "missed_levels": 1,
       "remaining_allowed_missed_slots": 9,
-      "expected_attesting_rewards": "12444" },
+      "expected_attesting_rewards": "12557" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -258,21 +258,21 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "212667097831",
-  "total_staked": "200000420271", "total_delegated": "38000032682",
+  "pending_staking_parameters": [], "baking_power": "212667093949",
+  "total_staked": "200000416469", "total_delegated": "38000032441",
   "min_delegated_in_current_cycle":
-    { "amount": "38000032682",
+    { "amount": "38000032441",
       "level":
         { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "238000452953", "own_staked": "200000420271",
-  "own_delegated": "38000032682", "external_staked": "0",
+  "own_full_balance": "238000448910", "own_staked": "200000416469",
+  "own_delegated": "38000032441", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" },
       { "cycle": 2, "deposit": "0" } ], "denunciations": [],
   "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0",
-  "current_voting_power": "238000452953", "voting_power": "4000000000000",
+  "current_voting_power": "238000448910", "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
   "consensus_key":
@@ -282,14 +282,14 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000420271" } ],
+        "frozen_deposits": "200000416469" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"38000032682"
+"38000032441"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002564709"
+"3762002540865"
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out
index f1bd85a9dbc8..496e7ca9396c 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667530414",
-  "total_staked": "200000378289", "total_delegated": "3800002395481",
+  "pending_staking_parameters": [], "baking_power": "1466667520701",
+  "total_staked": "200000374487", "total_delegated": "3800002371396",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001456375",
+    { "amount": "3800001438642",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000002773770", "own_staked": "200000378289",
-  "own_delegated": "3800002395481", "external_staked": "0",
+  "own_full_balance": "4000002745883", "own_staked": "200000374487",
+  "own_delegated": "3800002371396", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000002773770",
+  "staking_denominator": "0", "current_voting_power": "4000002745883",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,7 +149,7 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000378289" } ],
+        "frozen_deposits": "200000374487" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]'
@@ -158,7 +158,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -167,20 +167,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667530414",
-  "total_staked": "200000378289", "total_delegated": "3800002395481",
+  "pending_staking_parameters": [], "baking_power": "1466667520701",
+  "total_staked": "200000374487", "total_delegated": "3800002371396",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001456375",
+    { "amount": "3800001438642",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000002773770", "own_staked": "200000378289",
-  "own_delegated": "3800002395481", "external_staked": "0",
+  "own_full_balance": "4000002745883", "own_staked": "200000374487",
+  "own_delegated": "3800002371396", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000002773770",
+  "staking_denominator": "0", "current_voting_power": "4000002745883",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -191,11 +191,11 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000378289" } ],
+        "frozen_deposits": "200000374487" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3800002395481"
+"3800002371396"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
@@ -219,17 +219,17 @@ This sequence of operations was run:
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.06425
       storage fees ........................... +ꜩ0.06425
-      [PUBLIC_KEY_HASH] ... -ꜩ3762002.307919
-      [PUBLIC_KEY_HASH] ... +ꜩ3762002.307919
-      [PUBLIC_KEY_HASH] ... -ꜩ38000.023312
-      [PUBLIC_KEY_HASH] ... +ꜩ38000.023312
+      [PUBLIC_KEY_HASH] ... -ꜩ3762002.284075
+      [PUBLIC_KEY_HASH] ... +ꜩ3762002.284075
+      [PUBLIC_KEY_HASH] ... -ꜩ38000.023071
+      [PUBLIC_KEY_HASH] ... +ꜩ38000.023071
 
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info
-[ "7333333553818",
+[ "7333333552257",
   [ [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
-      "1466666846243" ],
+      "1466666844682" ],
     [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
       "1466666666666" ],
@@ -249,7 +249,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 59, "missed_levels": 1,
       "remaining_allowed_missed_slots": 9,
-      "expected_attesting_rewards": "12444" },
+      "expected_attesting_rewards": "12557" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -258,21 +258,21 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "212667056056",
-  "total_staked": "200000379360", "total_delegated": "38000030088",
+  "pending_staking_parameters": [], "baking_power": "212667052173",
+  "total_staked": "200000375558", "total_delegated": "38000029847",
   "min_delegated_in_current_cycle":
-    { "amount": "38000030088",
+    { "amount": "38000029847",
       "level":
         { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "238000409448", "own_staked": "200000379360",
-  "own_delegated": "38000030088", "external_staked": "0",
+  "own_full_balance": "238000405405", "own_staked": "200000375558",
+  "own_delegated": "38000029847", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" },
       { "cycle": 2, "deposit": "0" } ], "denunciations": [],
   "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0",
-  "current_voting_power": "238000409448", "voting_power": "4000000000000",
+  "current_voting_power": "238000405405", "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
   "consensus_key":
@@ -282,14 +282,14 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000379360" } ],
+        "frozen_deposits": "200000375558" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"38000030088"
+"38000029847"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002307919"
+"3762002284075"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002307919"
+"3762002284075"
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out
index 04770d690c6e..3df844dd9aff 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667530414",
-  "total_staked": "200000378289", "total_delegated": "3800002395481",
+  "pending_staking_parameters": [], "baking_power": "1466667520701",
+  "total_staked": "200000374487", "total_delegated": "3800002371396",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001456375",
+    { "amount": "3800001438642",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000002773770", "own_staked": "200000378289",
-  "own_delegated": "3800002395481", "external_staked": "0",
+  "own_full_balance": "4000002745883", "own_staked": "200000374487",
+  "own_delegated": "3800002371396", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000002773770",
+  "staking_denominator": "0", "current_voting_power": "4000002745883",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,7 +149,7 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000378289" } ],
+        "frozen_deposits": "200000374487" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]'
@@ -158,7 +158,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -167,20 +167,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667530414",
-  "total_staked": "200000378289", "total_delegated": "3800002395481",
+  "pending_staking_parameters": [], "baking_power": "1466667520701",
+  "total_staked": "200000374487", "total_delegated": "3800002371396",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001456375",
+    { "amount": "3800001438642",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000002773770", "own_staked": "200000378289",
-  "own_delegated": "3800002395481", "external_staked": "0",
+  "own_full_balance": "4000002745883", "own_staked": "200000374487",
+  "own_delegated": "3800002371396", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000002773770",
+  "staking_denominator": "0", "current_voting_power": "4000002745883",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -191,11 +191,11 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000378289" } ],
+        "frozen_deposits": "200000374487" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3800002395481"
+"3800002371396"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
@@ -219,17 +219,17 @@ This sequence of operations was run:
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.06425
       storage fees ........................... +ꜩ0.06425
-      [PUBLIC_KEY_HASH] ... -ꜩ3762002.307919
-      [PUBLIC_KEY_HASH] ... +ꜩ3762002.307919
-      [PUBLIC_KEY_HASH] ... -ꜩ38000.023312
-      [PUBLIC_KEY_HASH] ... +ꜩ38000.023312
+      [PUBLIC_KEY_HASH] ... -ꜩ3762002.284075
+      [PUBLIC_KEY_HASH] ... +ꜩ3762002.284075
+      [PUBLIC_KEY_HASH] ... -ꜩ38000.023071
+      [PUBLIC_KEY_HASH] ... +ꜩ38000.023071
 
 
 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info
-[ "7333333553818",
+[ "7333333552257",
   [ [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
-      "1466666846243" ],
+      "1466666844682" ],
     [ { "delegate": "[PUBLIC_KEY_HASH]",
         "consensus_pkh": "[PUBLIC_KEY_HASH]" },
       "1466666666666" ],
@@ -249,7 +249,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 59, "missed_levels": 1,
       "remaining_allowed_missed_slots": 9,
-      "expected_attesting_rewards": "12444" },
+      "expected_attesting_rewards": "12557" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -258,21 +258,21 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "212667056056",
-  "total_staked": "200000379360", "total_delegated": "38000030088",
+  "pending_staking_parameters": [], "baking_power": "212667052173",
+  "total_staked": "200000375558", "total_delegated": "38000029847",
   "min_delegated_in_current_cycle":
-    { "amount": "38000030088",
+    { "amount": "38000029847",
       "level":
         { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "238000409448", "own_staked": "200000379360",
-  "own_delegated": "38000030088", "external_staked": "0",
+  "own_full_balance": "238000405405", "own_staked": "200000375558",
+  "own_delegated": "38000029847", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" },
       { "cycle": 2, "deposit": "0" } ], "denunciations": [],
   "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0",
-  "current_voting_power": "238000409448", "voting_power": "4000000000000",
+  "current_voting_power": "238000405405", "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
   "consensus_key":
@@ -282,14 +282,14 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000379360" } ],
+        "frozen_deposits": "200000375558" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"38000030088"
+"38000029847"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance'
-"3762002307919"
+"3762002284075"
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out
index 9fee318e827e..bb53fc243fe3 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667657786",
-  "total_staked": "200000419200", "total_delegated": "3800002654865",
+  "pending_staking_parameters": [], "baking_power": "1466667648073",
+  "total_staked": "200000415398", "total_delegated": "3800002630780",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001715759",
+    { "amount": "3800001698026",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000003074065", "own_staked": "200000419200",
-  "own_delegated": "3800002654865", "external_staked": "0",
+  "own_full_balance": "4000003046178", "own_staked": "200000415398",
+  "own_delegated": "3800002630780", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000003074065",
+  "staking_denominator": "0", "current_voting_power": "4000003046178",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,5 +149,5 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000419200" } ],
+        "frozen_deposits": "200000415398" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out
index 997db597a783..cd573f16675c 100644
--- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out	
+++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out	
@@ -31,7 +31,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -72,7 +72,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -116,7 +116,7 @@ This sequence of operations was run:
     { "expected_cycle_activity": 204, "minimal_cycle_activity": 136,
       "missed_slots": 0, "missed_levels": 0,
       "remaining_allowed_missed_slots": 68,
-      "expected_attesting_rewards": "477972" },
+      "expected_attesting_rewards": "480016" },
   "dal_participation":
     { "expected_assigned_shards_per_slot": 204,
       "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0,
@@ -125,20 +125,20 @@ This sequence of operations was run:
   "active_staking_parameters":
     { "limit_of_staking_over_baking_millionth": 0,
       "edge_of_baking_over_staking_billionth": 1000000000 },
-  "pending_staking_parameters": [], "baking_power": "1466667530414",
-  "total_staked": "200000378289", "total_delegated": "3800002395481",
+  "pending_staking_parameters": [], "baking_power": "1466667520701",
+  "total_staked": "200000374487", "total_delegated": "3800002371396",
   "min_delegated_in_current_cycle":
-    { "amount": "3800001456375",
+    { "amount": "3800001438642",
       "level":
         { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
           "expected_commitment": false } },
-  "own_full_balance": "4000002773770", "own_staked": "200000378289",
-  "own_delegated": "3800002395481", "external_staked": "0",
+  "own_full_balance": "4000002745883", "own_staked": "200000374487",
+  "own_delegated": "3800002371396", "external_staked": "0",
   "external_delegated": "0",
   "total_unstaked_per_cycle":
     [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ],
   "denunciations": [], "estimated_shared_pending_slashed_amount": "0",
-  "staking_denominator": "0", "current_voting_power": "4000002773770",
+  "staking_denominator": "0", "current_voting_power": "4000002745883",
   "voting_power": "4000000000000",
   "voting_info":
     { "voting_power": "4000000000000", "remaining_proposals": 20 },
@@ -149,5 +149,5 @@ This sequence of operations was run:
   "companion_key": { "active": null },
   "stakers":
     [ { "staker": "[PUBLIC_KEY_HASH]",
-        "frozen_deposits": "200000378289" } ],
+        "frozen_deposits": "200000374487" } ],
   "delegators": [ "[PUBLIC_KEY_HASH]" ] }
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out
index 5f1c8a8fec6c..6a54d9c92ba0 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out	
@@ -1,6 +1,6 @@
 GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata
 200 OK
-{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-40879","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40879","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-258897","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"258897","origin":"block"}],"liquidity_baking_toggle_ema":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"207450","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"}
+{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"}],"liquidity_baking_toggle_ema":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"207450","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"}
 
 {
   "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
@@ -90,7 +90,7 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata
     {
       "kind": "minted",
       "category": "baking bonuses",
-      "change": "-40879",
+      "change": "-40911",
       "origin": "block"
     },
     {
@@ -99,19 +99,19 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata
       "staker": {
         "baker_own_stake": "[PUBLIC_KEY_HASH]"
       },
-      "change": "40879",
+      "change": "40911",
       "origin": "block"
     },
     {
       "kind": "minted",
       "category": "baking bonuses",
-      "change": "-258897",
+      "change": "-259099",
       "origin": "block"
     },
     {
       "kind": "contract",
       "contract": "[PUBLIC_KEY_HASH]",
-      "change": "258897",
+      "change": "259099",
       "origin": "block"
     }
   ],
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out
index 3d6b198aaeaa..c6366aada35f 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
@@ -137,7 +137,7 @@ Contract memorized as send_tickets_in_big_map.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 30 --storage-limit 1000000 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 98836.870 units (will add 100 for safety)
+Estimated gas: 98837.342 units (will add 100 for safety)
 Estimated storage: 10767 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -150,7 +150,7 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.01019
     Expected counter: 1
-    Gas limit: 98937
+    Gas limit: 98938
     Storage limit: 10787 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.01019
@@ -266,7 +266,7 @@ This sequence of operations was run:
         Set temp(1)[40] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
       Storage size: 320 bytes
       Paid storage size diff: 67 bytes
-      Consumed gas: 49910.967
+      Consumed gas: 49911.085
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.01675
         storage fees ........................... +ꜩ0.01675
@@ -283,7 +283,7 @@ This sequence of operations was run:
             Copy temp(1) to map(5)
           Storage size: 10783 bytes
           Paid storage size diff: 10700 bytes
-          Consumed gas: 48927.451
+          Consumed gas: 48927.805
           Balance updates:
             [PUBLIC_KEY_HASH] ... -ꜩ2.675
             storage fees ........................... +ꜩ2.675
-- 
GitLab