diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 6c10e7ec75c5e140459d2546d7529ad9284f0c51..0c86fa36ac1d9d17cdd7576f27b25ed11e85c1f6 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -127,15 +127,12 @@ let make_sc_rollup_parameter ~dal_activation_level riscv_pvm_enable = false; } -(* DAL/FIXME https://gitlab.com/tezos/tezos/-/issues/3177 - - Think harder about those values. *) let default_cryptobox_parameters = { - Dal.page_size = 4096; - slot_size = 1 lsl 20; - redundancy_factor = 16; - number_of_shards = 2048; + Dal.page_size = 3967; + slot_size = 126_944; + redundancy_factor = 8; + number_of_shards = 512; } let default_dal = @@ -143,9 +140,9 @@ let default_dal = { feature_enable = true; incentives_enable = false; - number_of_slots = 256; - attestation_lag = 4; - attestation_threshold = 50; + number_of_slots = 32; + attestation_lag = 8; + attestation_threshold = 66; cryptobox_parameters = default_cryptobox_parameters; } diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 35f610c314b9a6d2c25d0c133363e0f9386eca90..48a1358402c0a6f320e3084b8a00a978e6fa74d3 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1030,10 +1030,10 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = change. *) let cryptobox_parameters = { - Dal.page_size = 4096; - slot_size = 1 lsl 20; - redundancy_factor = 16; - number_of_shards = 2048; + Dal.page_size = 3967; + slot_size = 126_944; + redundancy_factor = 8; + number_of_shards = 512; } in let dal = @@ -1041,9 +1041,9 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = { feature_enable = true; incentives_enable = false; - number_of_slots = 256; - attestation_lag = 4; - attestation_threshold = 50; + number_of_slots = 32; + attestation_lag = 8; + attestation_threshold = 66; cryptobox_parameters; } in diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml index b3ae7673063c59411b5814eb3ad04b5436384f35..ac66781423fe11e3509a8adbfa40ee292385d789 100644 --- a/tezt/tests/dal.ml +++ b/tezt/tests/dal.ml @@ -4355,6 +4355,12 @@ module Tx_kernel_e2e = struct "wasm_2_0_0") Constant.WASM.tx_kernel_dal in + (* The kernel is badly written and may ask pages in negative + levels. We ensure it is not possible by baking enough + blocks. *) + let* () = + bake_for ~count:parameters.Dal.Parameters.attestation_lag client + in let* sc_rollup_address = Client.Sc_rollup.originate ~burn_cap:Tez.(of_int 9999999) @@ -4535,6 +4541,12 @@ module Tx_kernel_e2e = struct (Filename.concat (Sc_rollup_node.data_dir sc_rollup_node) pvm_name) Constant.WASM.dal_echo_kernel in + (* The kernel is badly written and may ask pages in negative + levels. We ensure it is not possible by baking enough + blocks. *) + let* () = + bake_for ~count:parameters.Dal.Parameters.attestation_lag client + in let* sc_rollup_address = Client.Sc_rollup.originate ~burn_cap:Tez.(of_int 9999999) @@ -4969,9 +4981,10 @@ let register ~protocols = ~uses:(fun _protocol -> [Constant.smart_rollup_installer; Constant.WASM.dal_echo_kernel]) ~pvm_name:"wasm_2_0_0" - ~number_of_shards:2048 + ~number_of_shards:256 ~slot_size:(1 lsl 15) - ~redundancy_factor:32 + ~redundancy_factor:8 + ~attestation_lag:4 ~page_size:128 test_reveal_dal_page_in_fast_exec_wasm_pvm protocols ; @@ -4981,10 +4994,11 @@ let register ~protocols = [Constant.smart_rollup_installer; Constant.WASM.tx_kernel_dal]) ~pvm_name:"wasm_2_0_0" ~producer_profiles:[0] - ~number_of_shards:2048 + ~number_of_shards:256 ~slot_size:(1 lsl 15) - ~redundancy_factor:32 + ~redundancy_factor:8 ~page_size:128 + ~attestation_lag:4 Tx_kernel_e2e.test_tx_kernel_e2e protocols ; scenario_with_all_nodes 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 1d9060d2c4c89ece64b38bc9eca803c8f4844d57..b1531bb1e30c120ffea509197a22a019779ab490 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 @@ -38,8 +38,8 @@ "cache_sampler_state_cycles": 8, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 16, + "number_of_slots": 16, "attestation_lag": 8, + "attestation_threshold": 66, "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 e0ab02cc8c52fd40b1599b250e8a5e0d68823e9a..fd631fadbdea5ffdbeabb326e578814aa399874f 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 @@ -38,8 +38,8 @@ "cache_sampler_state_cycles": 8, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 16, + "number_of_slots": 16, "attestation_lag": 8, + "attestation_threshold": 66, "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 e0016303b2aa6cff1e4ed6f1a227b06333dc9aed..55b3af2b38d98af05bb545fcdb58a27651cb53d1 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 @@ -38,8 +38,8 @@ "cache_sampler_state_cycles": 8, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 16, + "number_of_slots": 16, "attestation_lag": 8, + "attestation_threshold": 66, "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 4b95bc68d5c4c0f32e51869da26724ea68406edd..2acfc59c2cbb0d31d9a1bf6743284bfe390cbea3 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 @@ -38,8 +38,8 @@ "cache_sampler_state_cycles": 8, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 16, + "number_of_slots": 16, "attestation_lag": 8, + "attestation_threshold": 66, "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 4b95bc68d5c4c0f32e51869da26724ea68406edd..2acfc59c2cbb0d31d9a1bf6743284bfe390cbea3 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 @@ -38,8 +38,8 @@ "cache_sampler_state_cycles": 8, "dal_parametric": { "feature_enable": true, "incentives_enable": false, - "number_of_slots": 16, "attestation_lag": 4, - "attestation_threshold": 50, "redundancy_factor": 16, + "number_of_slots": 16, "attestation_lag": 8, + "attestation_threshold": 66, "redundancy_factor": 16, "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 e88e302e7b0114d9a26a84704265ba78e85bcc0e..d64fd51a1bf9c21c47d02c5e16d6b3667b7bb03c 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:4:16:0:2:4:6"]' from bootstrap2 +./octez-client --wait none send smart rollup message '["dal:16:8:16:0:2:4:6"]' from bootstrap2 Node is bootstrapped. Estimated gas: 170.903 units (will add 100 for safety) Estimated storage: no bytes added @@ -70,7 +70,7 @@ GET http://[HOST]:[PORT]/global/block/head/dal/processed_slots 200 OK [{"index":0,"status":"unconfirmed"},{"index":1,"status":"confirmed"},{"index":2,"status":"confirmed"},{"index":3,"status":"unconfirmed"},{"index":4,"status":"unconfirmed"},{"index":5,"status":"unconfirmed"},{"index":6,"status":"unconfirmed"},{"index":7,"status":"unconfirmed"},{"index":8,"status":"unconfirmed"},{"index":9,"status":"unconfirmed"},{"index":10,"status":"unconfirmed"},{"index":11,"status":"unconfirmed"},{"index":12,"status":"unconfirmed"},{"index":13,"status":"unconfirmed"},{"index":14,"status":"unconfirmed"},{"index":15,"status":"unconfirmed"}] -GET http://[HOST]:[PORT]/global/block/8/dal/processed_slots +GET http://[HOST]:[PORT]/global/block/12/dal/processed_slots 200 OK [{"index":0,"status":"unconfirmed"},{"index":1,"status":"confirmed"},{"index":2,"status":"confirmed"},{"index":3,"status":"unconfirmed"},{"index":4,"status":"unconfirmed"},{"index":5,"status":"unconfirmed"},{"index":6,"status":"unconfirmed"},{"index":7,"status":"unconfirmed"},{"index":8,"status":"unconfirmed"},{"index":9,"status":"unconfirmed"},{"index":10,"status":"unconfirmed"},{"index":11,"status":"unconfirmed"},{"index":12,"status":"unconfirmed"},{"index":13,"status":"unconfirmed"},{"index":14,"status":"unconfirmed"},{"index":15,"status":"unconfirmed"}] 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 ef9abcef82cdc29a833c0b9d2e6efd68be79175e..740ae285403675f6e6d47b4f64bd0519197da403 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,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:4:16:0:2:4:6"]' from bootstrap2 +./octez-client --wait none send smart rollup message '["dal:16:8:16:0:2:4:6"]' from bootstrap2 Node is bootstrapped. Estimated gas: 170.903 units (will add 100 for safety) Estimated storage: no bytes added @@ -70,7 +70,7 @@ GET http://[HOST]:[PORT]/global/block/head/dal/processed_slots 200 OK [{"index":0,"status":"unconfirmed"},{"index":1,"status":"confirmed"},{"index":2,"status":"confirmed"},{"index":3,"status":"unconfirmed"},{"index":4,"status":"unconfirmed"},{"index":5,"status":"unconfirmed"},{"index":6,"status":"unconfirmed"},{"index":7,"status":"unconfirmed"},{"index":8,"status":"unconfirmed"},{"index":9,"status":"unconfirmed"},{"index":10,"status":"unconfirmed"},{"index":11,"status":"unconfirmed"},{"index":12,"status":"unconfirmed"},{"index":13,"status":"unconfirmed"},{"index":14,"status":"unconfirmed"},{"index":15,"status":"unconfirmed"}] -GET http://[HOST]:[PORT]/global/block/8/dal/processed_slots +GET http://[HOST]:[PORT]/global/block/12/dal/processed_slots 200 OK [{"index":0,"status":"unconfirmed"},{"index":1,"status":"confirmed"},{"index":2,"status":"confirmed"},{"index":3,"status":"unconfirmed"},{"index":4,"status":"unconfirmed"},{"index":5,"status":"unconfirmed"},{"index":6,"status":"unconfirmed"},{"index":7,"status":"unconfirmed"},{"index":8,"status":"unconfirmed"},{"index":9,"status":"unconfirmed"},{"index":10,"status":"unconfirmed"},{"index":11,"status":"unconfirmed"},{"index":12,"status":"unconfirmed"},{"index":13,"status":"unconfirmed"},{"index":14,"status":"unconfirmed"},{"index":15,"status":"unconfirmed"}] 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 fee7b1b79ddf116b145bf0d82de42f2e90b0999e..dd1dc9010ea43fd66d595a85e74b29844218cf86 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.625 units (will add 100 for safety) +Estimated gas: 3715.433 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.559 + Consumed gas: 3715.367 Refutation game status: Game ended: [PUBLIC_KEY_HASH] lost because: timeout Balance updates: Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... -ęś©10000