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 957b7dec7d0a56a5f0ea6a1eb877404b42d54567..a79bfc7bacc3fca3126a55bbe6b86a1375bda947 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 -- 0x3fc89701f8bfcb0f6cd61d04853294efdf1f3f64530a321a7275a69d938c08fa +- 0xd73f08b85d698e4307583ab28caa091500cfe976c9aa46c957e963246b4c217c Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002 # FA Withdrawal ## Log 0 Address: 0xff00000000000000000000000000000000000002 Topics: - 0xab68450c9e546f6062a861eebf8ec5bbd41b4425e26b20199c91227c7f9038ca -- 0x3fc89701f8bfcb0f6cd61d04853294efdf1f3f64530a321a7275a69d938c08fa -Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c000000000000000000000000000000000000000000000000000000000000000001495c894beb8546d3e9deec5562da20546fe556ab000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000 +- 0xd73f08b85d698e4307583ab28caa091500cfe976c9aa46c957e963246b4c217c +Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c000000000000000000000000000000000000000000000000000000000000000001570e3b77b3e1db0ef4da1a0be85767bd91e158d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000 # FA Fast Withdrawal ## Log 0 Address: 0xff00000000000000000000000000000000000002 Topics: - 0x7e40c982e82bccb5e8bbd29f38bcfa3996f341ef9f51e2a9cffe086ec87a11c7 -- 0x3fc89701f8bfcb0f6cd61d04853294efdf1f3f64530a321a7275a69d938c08fa -Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000c55cf02dbeecc978d9c84625dcae72bb77ea4fbd0000000000000000000001495c894beb8546d3e9deec5562da20546fe556ab000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000005e0be103000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001 +- 0xd73f08b85d698e4307583ab28caa091500cfe976c9aa46c957e963246b4c217c +Data: 0x0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000000000000000000000006ce4d79d4e77402e1ef3417fdda433aa744c6e1c0000c55cf02dbeecc978d9c84625dcae72bb77ea4fbd0000000000000000000001570e3b77b3e1db0ef4da1a0be85767bd91e158d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000005e0be103000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001 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 022b13a094a1c8faafcc0e300320f58e98aa851b..b41a385848c4457ff975f794878135a3f877aed7 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 @@ -3,7 +3,7 @@ Address: 0xff00000000000000000000000000000000000002 Topics: - 0xb02d79c5657e344e23d91529b954c3087c60a974d598939583904a4f0b959614 -- 0x0c66b6ebec63009630d4c182a121163ac7c411b07cc19dd2805814cd911c7686 +- 0x20439b11ccadf7fd68ed2cb1bacc80a1d3df10f2374a62cefe6d4f45b9ee101a - 0x000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344 Data: 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000003 # Claimed deposit @@ -11,5 +11,5 @@ Data: 0x000000000000000000000000000000000000000000000000000000000000000000000000 Address: 0xff00000000000000000000000000000000000002 Topics: - 0x7ee7a1de9c18ce695c95b8b19fbdf26cce3544e3ca9e08c9f487776783d7599f -- 0x0c66b6ebec63009630d4c182a121163ac7c411b07cc19dd2805814cd911c7686 +- 0x20439b11ccadf7fd68ed2cb1bacc80a1d3df10f2374a62cefe6d4f45b9ee101a Data: 0x000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344000000000000000000000000d77420f73b4612a7a99dba8c2afd30a1886b0344000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000003 diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 4fbb299ba570a557fb4d829378406faf39b12423..d0d7c6a55de78e41180912c60417467f7464f1a1 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -158,7 +158,7 @@ let default_dal = feature_enable = true; incentives_enable = true; number_of_slots = 32; - attestation_lag = 8; + attestation_lag = 5; attestation_threshold = 66; cryptobox_parameters = default_cryptobox_parameters; minimal_participation_ratio = Q.(64 // 100); diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 7f0b406a948699ce08d748fe065256012377255d..902325b48df22f4a1dff0ec978e3edd262df393c 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -1093,6 +1093,8 @@ module Constants : sig val dal_number_of_shards : context -> int + val dal_attestation_lag : context -> int + val sc_rollup_arith_pvm_enable : context -> bool val sc_rollup_riscv_pvm_enable : context -> bool diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index e168e82ef706990242153749ceef017862fb20f6..b412a56dcbc7b2cdfa5ca07064a50ba925a7b718 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -2331,14 +2331,28 @@ let record_preattestation ctxt (mode : mode) (content : consensus_content) : consensus_key Attesting_power.zero (* Fake power. *) ) -let record_dal_content ctxt slot ~dal_power = function - | None -> Result.return ctxt +let record_dal_content ctxt level slot ~dal_power dal_content = + let open Lwt_result_syntax in + match dal_content with + | None -> return ctxt | Some {attestation} -> - Dal_apply.apply_attestation - ctxt - ~tb_slot:slot - attestation - ~power:dal_power + let* proto_activation_level = Protocol_activation_level.get ctxt in + let lag = Constants.dal_attestation_lag ctxt in + let attestation = + if Raw_level.(level < add proto_activation_level lag) then + (* TODO: https://gitlab.com/tezos/tezos/-/issues/8065 + CODE TO BE REVERTED IN PROTOCOL V *) + Dal.Attestation.empty + else attestation + in + let*? ctxt = + Dal_apply.apply_attestation + ctxt + ~tb_slot:slot + attestation + ~power:dal_power + in + return ctxt let record_attestation ctxt (mode : mode) (consensus : consensus_content) (dal : dal_content option) : @@ -2372,7 +2386,9 @@ let record_attestation ctxt (mode : mode) (consensus : consensus_content) ~initial_slot:consensus.slot ~power:attesting_power in - let*? ctxt = record_dal_content ctxt consensus.slot ~dal_power dal in + let* ctxt = + record_dal_content ctxt consensus.level consensus.slot ~dal_power dal + in return (ctxt, mk_attestation_result consensus_key attesting_power) | Partial_construction _ -> (* In mempool mode, attestations are allowed for various levels @@ -2402,24 +2418,25 @@ let record_attestations_aggregate ctxt (mode : mode) match mode with | Application _ | Full_construction _ -> let slot_map = Consensus.allowed_attestations ctxt in - let*? ctxt, rev_committee, total_consensus_power = - let open Result_syntax in - List.fold_left_e + let* ctxt, rev_committee, total_consensus_power = + List.fold_left_es (fun (ctxt, consensus_keys, consensus_power) (slot, dal) -> - let* { - consensus_key = {delegate; consensus_pkh; _}; - attesting_power; - dal_power; - } = + let*? { + consensus_key = {delegate; consensus_pkh; _}; + attesting_power; + dal_power; + } = find_in_slot_map slot slot_map in - let* ctxt = + let*? ctxt = Consensus.record_attestation ctxt ~initial_slot:slot ~power:attesting_power in - let* ctxt = record_dal_content ctxt slot ~dal_power dal in + let* ctxt = + record_dal_content ctxt content.level slot ~dal_power dal + in let key = ({delegate; consensus_pkh} : Consensus_key.t) in return ( ctxt, diff --git a/src/proto_alpha/lib_protocol/constants_storage.ml b/src/proto_alpha/lib_protocol/constants_storage.ml index 0b8feb92e7661871b90f2c3b7b45f7a87b6c8f67..7ecc17586ab36b4ae3bac1fe8f9a3d5d931ff207 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.ml +++ b/src/proto_alpha/lib_protocol/constants_storage.ml @@ -228,6 +228,10 @@ let dal_number_of_slots c = let constants = Raw_context.constants c in constants.dal.number_of_slots +let dal_attestation_lag c = + let constants = Raw_context.constants c in + constants.dal.attestation_lag + let dal_number_of_shards c = let constants = Raw_context.constants c in constants.dal.cryptobox_parameters.number_of_shards diff --git a/src/proto_alpha/lib_protocol/constants_storage.mli b/src/proto_alpha/lib_protocol/constants_storage.mli index 56f917327377fe7d1afa240b91c091bd3db1a040..35bd388b64064651a5a29d955a17ba3603a427cc 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.mli +++ b/src/proto_alpha/lib_protocol/constants_storage.mli @@ -130,6 +130,8 @@ val dal_number_of_slots : Raw_context.t -> int val dal_number_of_shards : Raw_context.t -> int +val dal_attestation_lag : Raw_context.t -> int + val dal_enable : Raw_context.t -> bool val zk_rollup_enable : Raw_context.t -> bool diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index b2dd33a6ac4de7cdea27abb08ec1878ed91be41c..cab958b3fb775e0ced6677fbb6896f18dc22dafc 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1352,7 +1352,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = feature_enable; incentives_enable; number_of_slots; - attestation_lag; + attestation_lag = _; attestation_threshold; cryptobox_parameters; minimal_participation_ratio; @@ -1366,7 +1366,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = Constants_parametric_repr.feature_enable; incentives_enable; number_of_slots; - attestation_lag; + attestation_lag = 5; attestation_threshold; cryptobox_parameters; minimal_participation_ratio; diff --git a/src/proto_alpha/lib_protocol/storage.ml b/src/proto_alpha/lib_protocol/storage.ml index cc82c9de7bd6ac74b0504dac8ece0be8fbebf9f6..18b37fe0eee0090e30fcfbd2d84348e5cdec44e1 100644 --- a/src/proto_alpha/lib_protocol/storage.ml +++ b/src/proto_alpha/lib_protocol/storage.ml @@ -2355,9 +2355,6 @@ module Dal = struct let name = ["slot_headers"] end) (struct - (* The size of the list below is at most equal to the - [number_of_slots] as declared in the DAL parameters of the - protocol. *) type t = (Dal_slot_repr.Header.t * Contract_repr.t) list let encoding = @@ -2385,8 +2382,6 @@ module Dal = struct let name = ["slot_headers_successive_histories_of_level"] end) (struct - (* The size of the list below is always equal to the [number_of_slots] - as declared in the DAL parameters of the protocol. *) type t = (Dal_slot_repr.History.Pointer_hash.t * Dal_slot_repr.History.t) list diff --git a/src/proto_alpha/lib_protocol/storage.mli b/src/proto_alpha/lib_protocol/storage.mli index 67751211b736a378efdcb44b36e3bc650a322c56..95bb6114fb510c29f10ac107cd9966790bb1c4bf 100644 --- a/src/proto_alpha/lib_protocol/storage.mli +++ b/src/proto_alpha/lib_protocol/storage.mli @@ -1110,7 +1110,9 @@ end module Dal : sig module Slot : sig - (** This is a temporary storage for slot headers proposed onto the L1. *) + (** This is a temporary storage for slot headers proposed onto the L1. The + size of the list is at most [number_of_slots] as declared + in the DAL parameters of the protocol. *) module Headers : Non_iterable_indexed_data_storage with type t = Raw_context.t @@ -1125,7 +1127,8 @@ module Dal : sig (** This single entry stores the cells of the DAL skip list constructed during the block under validation. The list is expected to have exactly - [number_of_slots] elements. Its cells ordering is not specified (and not + [number_of_slots] elements, except at the migration from T to U, where + it is a few times longer. Its cells ordering is not specified (and not relevant). A cell's binary encoding is bounded (the only part that is evolving in size over time is the number of backpointers, which is bounded by 64). *) diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index 557511eadf69ef82c4fd5bf265cef78ec5107ca0..9755b76507d863559627e6e846b02c124c9ec3ee 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -2522,8 +2522,6 @@ module Anonymous = struct in match slot_headers_opt with | None -> - (* TODO: https://gitlab.com/tezos/tezos/-/issues/7126 - Can also fail if `attestation_lag` changes. *) (* It should not happen if 1) the denunciation age is correct, and 2) \ the storage is updated correctly *) tzfail @@ -2548,8 +2546,6 @@ module Anonymous = struct in check_consensus_operation_signature vi consensus_key attestation | Some (header, _publisher) -> - (* TODO: https://gitlab.com/tezos/tezos/-/issues/7126 - Can also fail if `attestation_lag` changes. *) (* mismatch between published levels in \ storage versus in evidence; it should not happen *) tzfail diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml index 2508b935968be1a3c3f6161d831a437da7a5ff2b..1d32157aa8a1387acbeb5cee3e48c9991353a3a2 100644 --- a/tezt/tests/dal.ml +++ b/tezt/tests/dal.ml @@ -6114,7 +6114,7 @@ module Skip_list_rpcs = struct else if new_lag <> lag && level <= migration_level then Dal_RPC.Unattested else if level <= last_confirmed_published_level then - Dal_RPC.Attested lag + Dal_RPC.Attested new_lag else Dal_RPC.Unpublished in Check.( 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 ba976bc9301063060179243a43cd0d0410870347..e9181a3ed0413a07676e6d7590bc558fc6283848 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 @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol_abaab.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol_abaab.out index 572591a9c3805f442bc1925b60600d54eeaac392..34e7a888cc5bb4fc9fae777d9eb9d44bc95c63fc 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol_abaab.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol_abaab.out @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, 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 812620064bc5ac04533d04c6c327c5f643c7f007..8fc513ca97f0579c224aa50f2d67020cb2fc6250 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 @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol_abaab.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol_abaab.out index 481ea94d8d3112838a7dcca32c67add8ca041924..39d9c90c3d3a9ea7b268bc5b5e8b9b8ccd172df8 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol_abaab.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol_abaab.out @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, 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 4d1770a65aafa44d3822ffc181a7a4e8b2ca3fdb..718cfdbf436e441abe32ea3dfe6ce09829dc6fc8 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 @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol_abaab.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol_abaab.out index 36ad49469a202cae6f5c878062dc1b63b6249015..cf92eda46073a99e10412ac6ca89069c8dba4558 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol_abaab.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol_abaab.out @@ -40,7 +40,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": true, - "number_of_slots": 16, "attestation_lag": 8, + "number_of_slots": 16, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out index 75913d02c84d30fcca2707b218aeff8afef2bd4b..df177ef5258003514eb5727312dd3b7b64bc3d89 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out @@ -138,9 +138,9 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/context/issuance/expected_issua GET http://[HOST]:[PORT]/chains/main/blocks/head~1/context/delegates/[PUBLIC_KEY_HASH]/dal_participation 200 OK -{"expected_assigned_shards_per_slot":409,"delegate_attested_dal_slots":0,"delegate_attestable_dal_slots":6,"expected_dal_rewards":"212680","sufficient_dal_participation":false,"denounced":false} +{"expected_assigned_shards_per_slot":409,"delegate_attested_dal_slots":0,"delegate_attestable_dal_slots":5,"expected_dal_rewards":"212680","sufficient_dal_participation":false,"denounced":false} GET http://[HOST]:[PORT]/chains/main/blocks/head~1/context/delegates/[PUBLIC_KEY_HASH]/dal_participation 200 OK -{"expected_assigned_shards_per_slot":409,"delegate_attested_dal_slots":6,"delegate_attestable_dal_slots":6,"expected_dal_rewards":"212680","sufficient_dal_participation":true,"denounced":false} +{"expected_assigned_shards_per_slot":409,"delegate_attested_dal_slots":5,"delegate_attestable_dal_slots":5,"expected_dal_rewards":"212680","sufficient_dal_participation":true,"denounced":false} diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out index c9f493392e66b3df335d199ef345116fcd87f7b1..2d1ef00e164efb6393090b9945411957588920f3 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out @@ -38,7 +38,7 @@ Smart rollup [SMART_ROLLUP_HASH] memorized as "rollup" { "level": 2, "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } -./octez-client --wait none send smart rollup message '["dal:16:8:32:0:2:4:6"]' from bootstrap2 +./octez-client --wait none send smart rollup message '["dal:16:5:32:0:2:4:6"]' from bootstrap2 Node is bootstrapped. Estimated gas: 170.903 units (will add 100 for safety) Estimated storage: no bytes added diff --git a/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for SC rollup refutation operation.out b/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for SC rollup refutation operation.out index 3a16dde7ba840c7906fcec3f2fbcd4164305d9f0..c07e9f8f76c8088c1d91547ee85366bbe7f0224a 100644 --- a/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for SC rollup refutation operation.out +++ b/tezt/tests/expected/operation_size_and_gas.ml/Alpha- operation size and gas for SC rollup refutation operation.out @@ -70,4 +70,4 @@ This sequence of operations was run: [PUBLIC_KEY_HASH] ...................................................... -ꜩ10000 Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... +ꜩ10000 -smart_rollup_refute, 231, 5149.841000 +smart_rollup_refute, 231, 5149.845000 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out index dd1dc9010ea43fd66d595a85e74b29844218cf86..3cc512307a17e596ab3e5b2d34b0a6e611d78265 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out @@ -108,7 +108,7 @@ This sequence of operations was run: ./octez-client --wait none timeout dispute on smart rollup '[SMART_ROLLUP_HASH]' with '[PUBLIC_KEY_HASH]' against '[PUBLIC_KEY_HASH]' from bootstrap1 Node is bootstrapped. -Estimated gas: 3715.433 units (will add 100 for safety) +Estimated gas: 3715.627 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -131,7 +131,7 @@ This sequence of operations was run: First staker (Alice): [PUBLIC_KEY_HASH] Second staker (Bob): [PUBLIC_KEY_HASH] This smart rollup refutation timeout was successfully applied - Consumed gas: 3715.367 + Consumed gas: 3715.561 Refutation game status: Game ended: [PUBLIC_KEY_HASH] lost because: timeout Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ꜩ10000 diff --git a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out index cfa61ab0f80acdad845a34a15f5601a63685ed7a..c91bd5225fa41c5c8605aef436098c49dd7d7dc0 100644 --- a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out +++ b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out @@ -30,7 +30,7 @@ "cache_sampler_state_cycles": 5, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 32, "attestation_lag": 8, + "number_of_slots": 32, "attestation_lag": 5, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" },