From 6a4f4ba59ab46c5aa3432709fd16f5d2badc45a4 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Mon, 20 Feb 2023 11:37:15 +0100 Subject: [PATCH 1/2] Proto: update the gas cost of hashing a skip list cell. Follow-up of https://gitlab.com/tezos/tezos/-/merge_requests/7305. --- src/proto_alpha/lib_protocol/skip_list_costs.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_protocol/skip_list_costs.ml b/src/proto_alpha/lib_protocol/skip_list_costs.ml index fea0afed7bb8..e442f6872aee 100644 --- a/src/proto_alpha/lib_protocol/skip_list_costs.ml +++ b/src/proto_alpha/lib_protocol/skip_list_costs.ml @@ -32,11 +32,12 @@ let model_next ~length = let length = S.safe_z length in S.safe_int 20 * log2 (S.safe_int 1 + length) -(* Inferred from model model_hash_cell in file skip_list_benchmarks.ml *) -(* fun size -> (0. + (93.5015799571 * size)) *) +(* Inferred from model proto/alpha/skip_list/hash_cell in file + skip_list_benchmarks.ml *) +(* fun size -> (242.202299543 + (56.9693504823 * size)) *) let model_hash_cell backpointers_count = let open S.Syntax in - S.safe_int 95 * backpointers_count + S.safe_int 250 + (S.safe_int 57 * backpointers_count) let model_hash_cell_computed_backpointers_count ~index = model_hash_cell (S.Syntax.log2 (S.safe_z index)) -- GitLab From 990b2008487525cfb2ca18ff186e178424a7703a Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Sat, 25 Feb 2023 23:44:02 +0100 Subject: [PATCH 2/2] Proto: update regression traces. --- ...ith L1 (dac_rollup_arith_uses_reveals).out | 4 +- ... with L1 (dac_rollup_arith_wrong_hash).out | 4 +- ... (mainnet_lag-1_time-15_preinject-1_sl.out | 8 ++-- ... (mainnet_lag-3_time-5_preinject-10_sl.out | 8 ++-- ...ith L1 (rollup_node_applies_dal_pages).out | 10 ++--- ... with L1 (rollup_node_downloads_slots).out | 4 +- ... (testnet_lag-1_time-6_preinject-1_slo.out | 8 ++-- ... (testnet_lag-2_time-2_preinject-5_slo.out | 8 ++-- ...ces PVM state with messages (external).out | 40 +++++++++---------- ...rypoint- -aux- earliness- 0- external).out | 4 +- ...oint- -default- earliness- 0- external.out | 4 +- ...ces PVM state with messages (external).out | 40 +++++++++---------- ...ntrypoint- -aux- earliness- 0- externa.out | 4 +- ...ntrypoint- -default- earliness- 0- ext.out | 4 +- ... tx kernel should run e2e (kernel_e2e).out | 10 ++--- ...rt-contract rollup should succeed with.out | 4 +- ...rt-contract rollup should succeed with.out | 6 +-- 17 files changed, 85 insertions(+), 85 deletions(-) diff --git a/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_uses_reveals).out b/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_uses_reveals).out index 5c510070a03a..a20960c9adb8 100644 --- a/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_uses_reveals).out +++ b/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_uses_reveals).out @@ -39,7 +39,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428e7aa3"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.865 units (will add 100 for safety) +Estimated gas: 1002.431 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -59,7 +59,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000414 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.865 + Consumed gas: 1002.431 ./octez-smart-rollup-client-alpha get state value for vars/value --block head diff --git a/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_wrong_hash).out b/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_wrong_hash).out index b3a103c4ad94..fdc9bc1b88de 100644 --- a/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_wrong_hash).out +++ b/tezt/tests/expected/dac.ml/Alpha- Testing DAC rollup and node with L1 (dac_rollup_arith_wrong_hash).out @@ -39,7 +39,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428ecafe"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.865 units (will add 100 for safety) +Estimated gas: 1002.431 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -59,5 +59,5 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000414 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.865 + Consumed gas: 1002.431 diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-1_time-15_preinject-1_sl.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-1_time-15_preinject-1_sl.out index 2dc4f9dfd200..a84ed6a6a319 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-1_time-15_preinject-1_sl.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-1_time-15_preinject-1_sl.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[" dal:1:256:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,12 +55,12 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-client --wait none send smart rollup message '[" value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.531 units (will add 100 for safety) +Estimated gas: 1002.097 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000349 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.531 + Consumed gas: 1002.097 ./octez-smart-rollup-client-alpha get state value for vars/value --block head diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-3_time-5_preinject-10_sl.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-3_time-5_preinject-10_sl.out index 93d7924c4e21..90c480461075 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-3_time-5_preinject-10_sl.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (mainnet_lag-3_time-5_preinject-10_sl.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[" dal:3:256:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,12 +55,12 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-client --wait none send smart rollup message '["++++ value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.552 units (will add 100 for safety) +Estimated gas: 1002.118 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000353 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.552 + Consumed gas: 1002.118 ./octez-smart-rollup-client-alpha get state value for vars/value --block head 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 ec27bdda77fa..50eb09e6a51c 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 @@ -39,7 +39,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["dal:1:256:0:2:4:6"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.588 units (will add 100 for safety) +Estimated gas: 1002.154 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -59,7 +59,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.00036 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.588 + Consumed gas: 1002.154 ./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/slot_headers @@ -97,7 +97,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[" 99 3 "," + + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1005.083 units (will add 100 for safety) +Estimated gas: 1004.215 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -110,14 +110,14 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000363 Expected counter: 3 - Gas limit: 1106 + Gas limit: 1105 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000363 payload fees(the block proposer) ....... +ꜩ0.000363 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1005.083 + Consumed gas: 1004.215 ./octez-smart-rollup-client-alpha get state value for vars/value --block head 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 f522025fb374..e96e3427d617 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 @@ -39,7 +39,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["dal:1:256:0:2:4:6"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.588 units (will add 100 for safety) +Estimated gas: 1002.154 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -59,7 +59,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.00036 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.588 + Consumed gas: 1002.154 ./octez-smart-rollup-client-alpha rpc get /global/block/head/dal/slot_headers diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-1_time-6_preinject-1_slo.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-1_time-6_preinject-1_slo.out index a5e29b20c282..becf600c4b64 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-1_time-6_preinject-1_slo.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-1_time-6_preinject-1_slo.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[" dal:1:256:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,12 +55,12 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-client --wait none send smart rollup message '["+ value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.537 units (will add 100 for safety) +Estimated gas: 1002.103 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.00035 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.537 + Consumed gas: 1002.103 ./octez-smart-rollup-client-alpha get state value for vars/value --block head diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-2_time-2_preinject-5_slo.out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-2_time-2_preinject-5_slo.out index 9ddd84598ea3..39b3cc431f68 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-2_time-2_preinject-5_slo.out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (testnet_lag-2_time-2_preinject-5_slo.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[" dal:2:256:5 "]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,12 +55,12 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-client --wait none send smart rollup message '["++++ value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.552 units (will add 100 for safety) +Estimated gas: 1002.118 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000353 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.552 + Consumed gas: 1002.118 ./octez-smart-rollup-client-alpha get state value for vars/value --block head diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out index 25cad90bea3b..cf8783c496ae 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out @@ -45,7 +45,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.557 units (will add 100 for safety) +Estimated gas: 1002.123 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -65,7 +65,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000354 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.557 + Consumed gas: 1002.123 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -85,7 +85,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.557 units (will add 100 for safety) +Estimated gas: 1002.123 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -105,7 +105,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000354 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.557 + Consumed gas: 1002.123 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -125,7 +125,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -145,7 +145,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -165,7 +165,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -185,7 +185,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -205,7 +205,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -225,7 +225,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -245,7 +245,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -265,7 +265,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -285,7 +285,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -305,7 +305,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -325,7 +325,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -345,7 +345,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -365,7 +365,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -385,7 +385,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha get state value for vars/value --block head @@ -405,7 +405,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -425,7 +425,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-smart-rollup-client-alpha get state value for vars/value --block head diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out index 0c670ae7283b..69811a57a7d3 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[SMART_ROLLUP_EXTERNAL_MESSAGES]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.721 units (will add 100 for safety) +Estimated gas: 1002.287 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,7 +55,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000386 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.721 + Consumed gas: 1002.287 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out index 2bf2303e00f8..086096920324 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[SMART_ROLLUP_EXTERNAL_MESSAGES]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.701 units (will add 100 for safety) +Estimated gas: 1002.267 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,7 +55,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000382 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.701 + Consumed gas: 1002.267 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out index e09120ecb327..991d832cd567 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out @@ -45,7 +45,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.557 units (will add 100 for safety) +Estimated gas: 1002.123 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -65,7 +65,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000354 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.557 + Consumed gas: 1002.123 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -82,7 +82,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.557 units (will add 100 for safety) +Estimated gas: 1002.123 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -102,7 +102,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000354 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.557 + Consumed gas: 1002.123 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -119,7 +119,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -139,7 +139,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -156,7 +156,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -176,7 +176,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -193,7 +193,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -213,7 +213,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -230,7 +230,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -250,7 +250,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -267,7 +267,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -287,7 +287,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -304,7 +304,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -324,7 +324,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -341,7 +341,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.562 units (will add 100 for safety) +Estimated gas: 1002.128 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -361,7 +361,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000355 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.562 + Consumed gas: 1002.128 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash @@ -378,7 +378,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.567 units (will add 100 for safety) +Estimated gas: 1002.133 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -398,7 +398,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000356 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.567 + Consumed gas: 1002.133 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out index c7a357800892..99183ad46998 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[SMART_ROLLUP_EXTERNAL_MESSAGES]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.685 units (will add 100 for safety) +Estimated gas: 1002.251 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,7 +55,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000379 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.685 + Consumed gas: 1002.251 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out index 9a87d344aa64..d9dbd71b1367 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out @@ -35,7 +35,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[SMART_ROLLUP_EXTERNAL_MESSAGES]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1002.706 units (will add 100 for safety) +Estimated gas: 1002.272 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,7 +55,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000383 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1002.706 + Consumed gas: 1002.272 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10 diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out index 677bf7b8e3f6..5435349154fb 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out @@ -42,7 +42,7 @@ This sequence of operations was run: ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1000 --arg 'Pair (Pair "[SMART_ROLLUP_HASH]" "[TX_ROLLUP_PUBLIC_KEY_HASH]") (Pair 450 "Hello, Ticket!")' Node is bootstrapped. -Estimated gas: 4058.254 units (will add 100 for safety) +Estimated gas: 4057.820 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -55,7 +55,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000779 Expected counter: 3 - Gas limit: 4159 + Gas limit: 4158 Storage limit: 87 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000779 @@ -82,7 +82,7 @@ This sequence of operations was run: Parameter: (Pair "[TX_ROLLUP_PUBLIC_KEY_HASH]" (Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 450))) This transaction was successfully applied - Consumed gas: 1007.394 + Consumed gas: 1006.960 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -102,7 +102,7 @@ This sequence of operations was run: ./octez-client --wait none send smart rollup message '[SMART_ROLLUP_EXTERNAL_MESSAGES]' from bootstrap2 Node is bootstrapped. -Estimated gas: 1003.828 units (will add 100 for safety) +Estimated gas: 1003.394 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -122,7 +122,7 @@ This sequence of operations was run: payload fees(the block proposer) ....... +ꜩ0.000602 Smart rollup messages submission: This smart rollup messages submission was successfully applied - Consumed gas: 1003.828 + Consumed gas: 1003.394 ./octez-smart-rollup-client-alpha rpc get /global/block/head/state_hash diff --git a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out index 56b12fd5fa30..2ad789ab8830 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 4514.890 units (will add 100 for safety) +Estimated gas: 4514.456 units (will add 100 for safety) Estimated storage: 132 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -40,7 +40,7 @@ This sequence of operations was run: Parameter: { Pair 0x01fd32c99a7029e62387c85d6e9394626ecbcaa97700 (Pair "Ticket2" 1) ; Pair 0x01fd32c99a7029e62387c85d6e9394626ecbcaa97700 (Pair "Ticket" 1) } This transaction was successfully applied - Consumed gas: 1010.375 + Consumed gas: 1009.941 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out index afc98b7e56d9..f8e49d688ea9 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out @@ -49,7 +49,7 @@ This sequence of operations was run: ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 4872.137 units (will add 100 for safety) +Estimated gas: 4871.703 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -62,7 +62,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000797 Expected counter: 4 - Gas limit: 4973 + Gas limit: 4972 Storage limit: 0 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000797 @@ -96,7 +96,7 @@ This sequence of operations was run: Parameter: { Pair 0x017a1d05251a570ed6e6e5af81f60883b857f8664500 (Pair "Ticket2" 1) ; Pair 0x017a1d05251a570ed6e6e5af81f60883b857f8664500 (Pair "Ticket" 1) } This transaction was successfully applied - Consumed gas: 1010.375 + Consumed gas: 1009.941 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string -- GitLab