diff --git a/src/proto_018_Proxford/lib_parameters/default_parameters.ml b/src/proto_018_Proxford/lib_parameters/default_parameters.ml index 4ad6c469fadeead2778588f52b00576d67f7c52d..500b85a9318fd975014fb6e46a75d336e948608d 100644 --- a/src/proto_018_Proxford/lib_parameters/default_parameters.ml +++ b/src/proto_018_Proxford/lib_parameters/default_parameters.ml @@ -280,19 +280,6 @@ let constants_mainnet = }; } -(* Sandbox and test networks's Dal cryptobox are computed by this function: - - Redundancy_factor is provided as a parameter; - - The other fields are derived from mainnet's values, as divisions by the - provided factor. *) -let derive_cryptobox_parameters ~redundancy_factor ~mainnet_constants_divider = - let m = default_cryptobox_parameters in - { - Dal.redundancy_factor; - page_size = m.page_size / mainnet_constants_divider; - slot_size = m.slot_size / mainnet_constants_divider; - number_of_shards = m.number_of_shards / mainnet_constants_divider; - } - let constants_sandbox = let consensus_committee_size = 256 in let block_time = 1 in @@ -308,9 +295,12 @@ let constants_sandbox = number_of_slots = 16; blocks_per_epoch = 1l; cryptobox_parameters = - derive_cryptobox_parameters - ~redundancy_factor:8 - ~mainnet_constants_divider:32; + { + Dal.redundancy_factor = 16; + page_size = 4096; + number_of_shards = 2048; + slot_size = 1 lsl 16; + }; }; issuance_weights; Constants.Parametric.preserved_cycles = 2; @@ -343,9 +333,12 @@ let constants_test = number_of_slots = 8; blocks_per_epoch = 1l; cryptobox_parameters = - derive_cryptobox_parameters - ~redundancy_factor:4 - ~mainnet_constants_divider:64; + { + Dal.redundancy_factor = 16; + page_size = 4096; + number_of_shards = 2048; + slot_size = 1 lsl 16; + }; }; issuance_weights; Constants.Parametric.preserved_cycles = 3; diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index c582c1fb3631387f68f9f3fbbe01dd90a7dc1700..1012559309b4d8a8427dbfddbb398f847661ff84 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -141,7 +141,7 @@ let default_cryptobox_parameters = let default_dal = Constants.Parametric. { - feature_enable = false; + feature_enable = true; incentives_enable = false; number_of_slots = 256; attestation_lag = 4; @@ -317,19 +317,6 @@ let constants_mainnet : Constants.Parametric.t = direct_ticket_spending_enable = false; } -(* Sandbox and test networks's Dal cryptobox are computed by this function: - - Redundancy_factor is provided as a parameter; - - The other fields are derived from mainnet's values, as divisions by the - provided factor. *) -let derive_cryptobox_parameters ~redundancy_factor ~mainnet_constants_divider = - let m = default_cryptobox_parameters in - { - Dal.redundancy_factor; - page_size = m.page_size / mainnet_constants_divider; - slot_size = m.slot_size / mainnet_constants_divider; - number_of_shards = m.number_of_shards / mainnet_constants_divider; - } - let constants_sandbox = let consensus_committee_size = 256 in let block_time = 1 in @@ -345,9 +332,12 @@ let constants_sandbox = constants_mainnet.dal with number_of_slots = 16; cryptobox_parameters = - derive_cryptobox_parameters - ~redundancy_factor:8 - ~mainnet_constants_divider:32; + { + Dal.redundancy_factor = 16; + page_size = 4096; + number_of_shards = 2048; + slot_size = 1 lsl 16; + }; }; issuance_weights; blocks_preservation_cycles = 1; @@ -382,9 +372,12 @@ let constants_test = constants_mainnet.dal with number_of_slots = 8; cryptobox_parameters = - derive_cryptobox_parameters - ~redundancy_factor:4 - ~mainnet_constants_divider:64; + { + redundancy_factor = 16; + page_size = 4096; + number_of_shards = 2048; + slot_size = 1 lsl 16; + }; }; issuance_weights; consensus_rights_delay = 3; diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 2b13a0253164ae7ba4940fbcbcb4c110af0f0881..e280159687af3ca375426a689602dc71ff647d12 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1033,46 +1033,41 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = (* When modifying the line below, be careful that the values are compatible with the encodings exported by the environment did not change. *) - let cryptobox_parameters = c.dal.cryptobox_parameters in + let cryptobox_parameters = + { + Dal.page_size = 4096; + slot_size = 1 lsl 20; + redundancy_factor = 16; + number_of_shards = 2048; + } + in let dal = Constants_parametric_repr. { - feature_enable = c.dal.feature_enable; + feature_enable = true; incentives_enable = false; - number_of_slots = c.dal.number_of_slots; - attestation_lag = c.dal.attestation_lag; - attestation_threshold = c.dal.attestation_threshold; + number_of_slots = 256; + attestation_lag = 4; + attestation_threshold = 50; cryptobox_parameters; } in (* This test prevents the activation of the protocol if the set of parameters given for the DAL is invalid. *) let*? () = - if dal.feature_enable then - match Dal.make cryptobox_parameters with - | Ok _cryptobox -> ok () - | Error (`Fail explanation) -> - error (Dal_errors_repr.Dal_cryptobox_error {explanation}) - else ok () + match Dal.make cryptobox_parameters with + | Ok _cryptobox -> ok () + | Error (`Fail explanation) -> + error (Dal_errors_repr.Dal_cryptobox_error {explanation}) in let dal_activation_level = if c.dal.feature_enable then (* if dal was enable in previous protocol, do as if it were always activated *) Raw_level_repr.succ Raw_level_repr.root - else if dal.feature_enable then + else (* dal activates at first level of the new protocol. *) Raw_level_repr.of_int32_exn (Int32.succ level) - else - (* Deactivate the reveal if the dal is not enabled. - - assert (not (c.dal.feature_enable || dal.feature_enable)) - - We set the activation level to [pred max_int] to deactivate - the feature. The [pred] is needed to not trigger an encoding - exception with the value [Int32.int_min] (see - tezt/tests/mockup.ml). *) - Raw_level_repr.of_int32_exn Int32.(pred max_int) in let dal_attested_slots_validity_lag = (* A rollup node shouldn't import a page of an attested slot whose attested diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/test_attestation.ml b/src/proto_alpha/lib_protocol/test/integration/consensus/test_attestation.ml index c68976596572c4abf848eddb710470919bf9a775..3d41a37340b9a61aadc055e7d12afd86394060b6 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/test_attestation.ml +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/test_attestation.ml @@ -682,7 +682,7 @@ let test_two_attestations_with_same_attester () = committee, then an error is returned at block validation. Note that we change the value of [consensus_committee_size] because with the - default test parameters, [consensus_committee_size = 25 < 32 = + default test parameters, [consensus_committee_size = 25 < 64 = number_of_shards], so that test would not work! *) let test_attester_not_in_dal_committee () = let open Lwt_result_syntax in @@ -691,9 +691,23 @@ let test_attester_not_in_dal_committee () = (* Create many accounts with balance [bal_high] and one with [bal_low]. *) let n = 10 in let bootstrap_balances = bal_low :: Stdlib.List.init n (fun _ -> bal_high) in + let dal = + Tezos_protocol_alpha_parameters.Default_parameters.constants_sandbox.dal + in + let dal = + (* We need to take a small number of shards to be sure there is a + really high probability an attester is not part of the DAL + committee in the first hundred blocks. *) + { + dal with + cryptobox_parameters = + {dal.cryptobox_parameters with number_of_shards = 64}; + } + in let* genesis, contracts = Context.init_gen ~dal_enable:true + ~dal ~consensus_committee_size:100 ~consensus_threshold:0 ~bootstrap_balances 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 f945c9ee80645cab8c4a6bd79a928744797446f6..0f3ba89ec8716d258e68bd7d65c44cf9fefc781d 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 @@ -37,10 +37,10 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, "dal_parametric": - { "feature_enable": false, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": false, "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 8, "page_size": 128, - "slot_size": 32768, "number_of_shards": 64 }, + "attestation_threshold": 50, "redundancy_factor": 16, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 120960, @@ -54,9 +54,8 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646, - "dal_parameters": 2147483646, - "dal_attested_slots_validity_lag": 241920 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 1, + "dal_parameters": 1, "dal_attested_slots_validity_lag": 241920 }, "smart_rollup_private_enable": true, "smart_rollup_riscv_pvm_enable": false, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, 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 607044fe19a6850c837bb225c45ae21346affd79..aac8177c008a6cda7f816f9b602608e26c4a330a 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 @@ -37,10 +37,10 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, "dal_parametric": - { "feature_enable": false, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": false, "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 8, "page_size": 128, - "slot_size": 32768, "number_of_shards": 64 }, + "attestation_threshold": 50, "redundancy_factor": 16, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 120960, @@ -54,9 +54,8 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646, - "dal_parameters": 2147483646, - "dal_attested_slots_validity_lag": 241920 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 1, + "dal_parameters": 1, "dal_attested_slots_validity_lag": 241920 }, "smart_rollup_private_enable": true, "smart_rollup_riscv_pvm_enable": false, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, 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 2e54b8ee0dcab96dedaa9f054c88c3acbe612b25..2149eb2092eb6cc7b77a11f3ab09cf08bc353650 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 @@ -37,10 +37,10 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, "dal_parametric": - { "feature_enable": false, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": false, "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 8, "page_size": 128, - "slot_size": 32768, "number_of_shards": 64 }, + "attestation_threshold": 50, "redundancy_factor": 16, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 120960, @@ -54,9 +54,8 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646, - "dal_parameters": 2147483646, - "dal_attested_slots_validity_lag": 241920 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 1, + "dal_parameters": 1, "dal_attested_slots_validity_lag": 241920 }, "smart_rollup_private_enable": true, "smart_rollup_riscv_pvm_enable": false, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index 4475dea214b6ea36a18f1dc000231606803e2518..3b39db3348d5c02fecd74e6ad7e93f7caac6bb46 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out @@ -37,10 +37,10 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, "dal_parametric": - { "feature_enable": false, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": false, "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 8, "page_size": 128, - "slot_size": 32768, "number_of_shards": 64 }, + "attestation_threshold": 50, "redundancy_factor": 16, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 120960, @@ -54,9 +54,8 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646, - "dal_parameters": 2147483646, - "dal_attested_slots_validity_lag": 241920 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 1, + "dal_parameters": 1, "dal_attested_slots_validity_lag": 241920 }, "smart_rollup_private_enable": true, "smart_rollup_riscv_pvm_enable": false, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index 4475dea214b6ea36a18f1dc000231606803e2518..3b39db3348d5c02fecd74e6ad7e93f7caac6bb46 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out @@ -37,10 +37,10 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 8, "cache_sampler_state_cycles": 8, "dal_parametric": - { "feature_enable": false, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": false, "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 8, "page_size": 128, - "slot_size": 32768, "number_of_shards": 64 }, + "attestation_threshold": 50, "redundancy_factor": 16, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 120960, @@ -54,9 +54,8 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646, - "dal_parameters": 2147483646, - "dal_attested_slots_validity_lag": 241920 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 1, + "dal_parameters": 1, "dal_attested_slots_validity_lag": 241920 }, "smart_rollup_private_enable": true, "smart_rollup_riscv_pvm_enable": false, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- misc_protocol.out index 209932660179019e6026db7951a0c6a44ce19184..a4dd8a7c3dca92a7481c8463595da44f72158329 100644 --- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- misc_protocol.out @@ -37,8 +37,8 @@ "dal_parametric": { "feature_enable": false, "number_of_slots": 16, "attestation_lag": 4, "attestation_threshold": 50, "blocks_per_epoch": 1, - "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, - "number_of_shards": 64 }, "smart_rollup_arith_pvm_enable": false, + "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, + "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 80640, "smart_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode light) RPC regression tests- misc_protocol.out index 54ea9a3f12294ed2c6a39ab5e7c0c7b29d3fac44..a19c484ab3535df491bf6e6ad199371518a18e18 100644 --- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode light) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode light) RPC regression tests- misc_protocol.out @@ -37,8 +37,8 @@ "dal_parametric": { "feature_enable": false, "number_of_slots": 16, "attestation_lag": 4, "attestation_threshold": 50, "blocks_per_epoch": 1, - "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, - "number_of_shards": 64 }, "smart_rollup_arith_pvm_enable": false, + "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, + "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 80640, "smart_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- misc_protocol.out index 6edd3c806943cd72e4bbda2e2c193b27a4e23256..b419716a0e3be2b9142d71e52e2c9e645c5d5c7f 100644 --- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- misc_protocol.out @@ -37,8 +37,8 @@ "dal_parametric": { "feature_enable": false, "number_of_slots": 16, "attestation_lag": 4, "attestation_threshold": 50, "blocks_per_epoch": 1, - "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, - "number_of_shards": 64 }, "smart_rollup_arith_pvm_enable": false, + "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, + "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 80640, "smart_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index c3e158d9c20248a513fc2feedd0278dfc4a3bbca..3ae4ae69ef803c17ac96565aafc28d18bd55248d 100644 --- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out @@ -37,8 +37,8 @@ "dal_parametric": { "feature_enable": false, "number_of_slots": 16, "attestation_lag": 4, "attestation_threshold": 50, "blocks_per_epoch": 1, - "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, - "number_of_shards": 64 }, "smart_rollup_arith_pvm_enable": false, + "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, + "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 80640, "smart_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index c3e158d9c20248a513fc2feedd0278dfc4a3bbca..3ae4ae69ef803c17ac96565aafc28d18bd55248d 100644 --- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out @@ -37,8 +37,8 @@ "dal_parametric": { "feature_enable": false, "number_of_slots": 16, "attestation_lag": 4, "attestation_threshold": 50, "blocks_per_epoch": 1, - "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, - "number_of_shards": 64 }, "smart_rollup_arith_pvm_enable": false, + "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, + "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, "smart_rollup_challenge_window_in_blocks": 80640, "smart_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out index 4188051db3bea475549d9f60cdb08246a8d08093..9b0b59f3e53cc02967056cfaf30ef1e041caacb0 100644 --- a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out +++ b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out @@ -123,4 +123,4 @@ "paid_storage_size_diff": "1" } ], "proposer_consensus_key": "[PUBLIC_KEY_HASH]", "baker_consensus_key": "[PUBLIC_KEY_HASH]", - "consumed_milligas": "0" } + "consumed_milligas": "0", "dal_attestation": "0" } 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 fb1cdb8f63a4808b8c2f0b69ac3beceef092d628..e88e302e7b0114d9a26a84704265ba78e85bcc0e 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,9 +38,9 @@ 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:4:256:0:2:4:6"]' from bootstrap2 +./octez-client --wait none send smart rollup message '["dal:16:4:16:0:2:4:6"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 170.941 units (will add 100 for safety) +Estimated gas: 170.903 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -51,16 +51,16 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00028 + Fee to the baker: ꜩ0.000279 Expected counter: 1 Gas limit: 271 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00028 - payload fees(the block proposer) ....... +ꜩ0.00028 + [PUBLIC_KEY_HASH] ... -ꜩ0.000279 + payload fees(the block proposer) ....... +ꜩ0.000279 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 170.875 + Consumed gas: 170.836 GET http://[HOST]:[PORT]/global/block/head/dal/slot_headers 200 OK diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out index fb3f446ffc2b4851469e754a76e226646e68a73b..ef9abcef82cdc29a833c0b9d2e6efd68be79175e 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out @@ -38,9 +38,9 @@ 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:4:256:0:2:4:6"]' from bootstrap2 +./octez-client --wait none send smart rollup message '["dal:16:4:16:0:2:4:6"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 170.941 units (will add 100 for safety) +Estimated gas: 170.903 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -51,16 +51,16 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.00028 + Fee to the baker: ꜩ0.000279 Expected counter: 1 Gas limit: 271 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.00028 - payload fees(the block proposer) ....... +ꜩ0.00028 + [PUBLIC_KEY_HASH] ... -ꜩ0.000279 + payload fees(the block proposer) ....... +ꜩ0.000279 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 170.875 + Consumed gas: 170.836 GET http://[HOST]:[PORT]/global/block/head/dal/slot_headers 200 OK diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-12_preinject-1_slots.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-12_preinject-1_slots.out index bc3ad953c7b943b57ff712fe3141c9bd689e243d..a73abd633dde7a5ade9a0da51a19f3c7fc2796e0 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-12_preinject-1_slots.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-12_preinject-1_slots.out @@ -34,9 +34,9 @@ This sequence of operations was run: Smart rollup [SMART_ROLLUP_HASH] memorized as "rollup" -./octez-client --wait none send smart rollup message '[" dal:16:3:256:5 "]' from bootstrap2 +./octez-client --wait none send smart rollup message '[" dal:16:3:16:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 170.788 units (will add 100 for safety) +Estimated gas: 170.750 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -47,16 +47,16 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000276 + Fee to the baker: ꜩ0.000275 Expected counter: 1 Gas limit: 271 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000276 - payload fees(the block proposer) ....... +ꜩ0.000276 + [PUBLIC_KEY_HASH] ... -ꜩ0.000275 + payload fees(the block proposer) ....... +ꜩ0.000275 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 170.722 + Consumed gas: 170.684 ./octez-client --wait none send smart rollup message '["+ value"]' from bootstrap2 diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-4_preinject-5_slots-.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-4_preinject-5_slots-.out index 043688f01b092a5730df3eba9cff51b497119807..764b15a75e10fc2d725623e98047c5a8b8035902 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-4_preinject-5_slots-.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (test_lag-3_time-4_preinject-5_slots-.out @@ -34,9 +34,9 @@ This sequence of operations was run: Smart rollup [SMART_ROLLUP_HASH] memorized as "rollup" -./octez-client --wait none send smart rollup message '[" dal:16:3:256:5 "]' from bootstrap2 +./octez-client --wait none send smart rollup message '[" dal:16:3:16:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 170.788 units (will add 100 for safety) +Estimated gas: 170.750 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -47,16 +47,16 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.000276 + Fee to the baker: ꜩ0.000275 Expected counter: 1 Gas limit: 271 Storage limit: 0 bytes Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.000276 - payload fees(the block proposer) ....... +ꜩ0.000276 + [PUBLIC_KEY_HASH] ... -ꜩ0.000275 + payload fees(the block proposer) ....... +ꜩ0.000275 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 170.722 + Consumed gas: 170.684 ./octez-client --wait none send smart rollup message '["++++ value"]' from bootstrap2 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..fee7b1b79ddf116b145bf0d82de42f2e90b0999e 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.625 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.559 Refutation game status: Game ended: [PUBLIC_KEY_HASH] lost because: timeout Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ꜩ10000