From cace2667ccc4131a3b60c558027e22f5e8828ec4 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Tue, 23 Aug 2022 16:41:09 +0200 Subject: [PATCH] Proto/Scoru: increment ticks when setting an input in arith PVM --- .../lib_protocol/sc_rollup_arith.ml | 14 ++-- ...ances PVM state with internal messages.out | 76 +++++++++---------- ... node advances PVM state with messages.out | 76 +++++++++---------- ...games winning strategies (inbox_proof).out | 2 +- ...ng strategies (inbox_proof_at_genesis).out | 2 +- ...rategies (inbox_proof_many_empty_level.out | 2 +- ...rategies (inbox_proof_one_empty_level).out | 2 +- ...games winning strategies (pvm_proof_0).out | 2 +- ...games winning strategies (pvm_proof_1).out | 2 +- ...games winning strategies (pvm_proof_2).out | 2 +- ...games winning strategies (pvm_proof_3).out | 2 +- ...ning strategies (pvm_proof_at_genesis).out | 2 +- ...ion games winning strategies (timeout).out | 2 +- ...ing of commitments (batcher_does_not_p.out | 4 +- ...ing of commitments (commitment_is_stor.out | 8 +- ...ing of commitments (maintenance_publis.out | 8 +- ...ndling of commitments (messages_reset).out | 4 +- ...ing of commitments (node_use_proto_par.out | 8 +- ...ing of commitments (observer_does_not_.out | 4 +- ...ing of commitments (operator_publishes.out | 8 +- ...ing of commitments (robust_to_failures.out | 8 +- ...lpha- ensure arith boot sector is used.out | 4 +- 22 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/proto_alpha/lib_protocol/sc_rollup_arith.ml b/src/proto_alpha/lib_protocol/sc_rollup_arith.ml index 331e7e23503d..36a9ea2d5fd6 100644 --- a/src/proto_alpha/lib_protocol/sc_rollup_arith.ml +++ b/src/proto_alpha/lib_protocol/sc_rollup_arith.ml @@ -873,7 +873,13 @@ module Make (Context : P) : let* () = Status.set Waiting_for_input_message in return () - let set_input input = state_of @@ set_input_monadic input + let ticked m = + let open Monad.Syntax in + let* tick = Current_tick.get in + let* () = Current_tick.set (Sc_rollup_tick_repr.next tick) in + m + + let set_input input = set_input_monadic input |> ticked |> state_of let next_char = let open Monad.Syntax in @@ -1072,12 +1078,6 @@ module Make (Context : P) : | Parsing -> parse | Evaluating -> evaluate) - let ticked m = - let open Monad.Syntax in - let* tick = Current_tick.get in - let* () = Current_tick.set (Sc_rollup_tick_repr.next tick) in - m - let eval state = state_of (ticked eval_step) state let step_transition input_given state = diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with internal messages.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with internal messages.out index f54e9f7496da..243a4d1a81ca 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with internal messages.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with internal messages.out @@ -47,142 +47,142 @@ This sequence of operations was run: "\000\000\000\007" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12qBnDaws8qffw6QDktoXqyVnQqsB7ZYta9AeumRrJu46uEXa8s" +"scs139EB5Ny4fma7o6nS9mGauvHFbwpfvsJijBU4tNjEr9QZ8ZJWQd" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"18" +"19" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12qBnDaws8qffw6QDktoXqyVnQqsB7ZYta9AeumRrJu46uEXa8s" +"scs139EB5Ny4fma7o6nS9mGauvHFbwpfvsJijBU4tNjEr9QZ8ZJWQd" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"18" +"19" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\n" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs132JyuMz3CnpXF3jbe2nJdJ4CbLnwGfUdpwRf9H14oKbLGf6gXY" +"scs12UMx1ykNkh7mGwph7oc47aPAYSZfSdx6E6gqHdNuD3fWoY5z7V" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"35" +"37" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs132JyuMz3CnpXF3jbe2nJdJ4CbLnwGfUdpwRf9H14oKbLGf6gXY" +"scs12UMx1ykNkh7mGwph7oc47aPAYSZfSdx6E6gqHdNuD3fWoY5z7V" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"35" +"37" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\r" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13LToVZYSTBF7YCWecXYN2PnbPa1YykGn9k4R5His735aYYqFZ9" +"scs12ssnuPLi7HmVNDsZmAn38HQHQ3Yy7M8iqxALseKWEZjhetGdQj" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"53" +"56" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13LToVZYSTBF7YCWecXYN2PnbPa1YykGn9k4R5His735aYYqFZ9" +"scs12ssnuPLi7HmVNDsZmAn38HQHQ3Yy7M8iqxALseKWEZjhetGdQj" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"53" +"56" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\016" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13GPvXsed8QkXQ6BdyqaED7ySSNJyAN8J8c318DpKCUwngmemeX" +"scs11bU88Xg7RJhWwcd6xjATkP9KxurEXizBzGm99Y7f1AuwHSwMFr" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"71" +"75" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13GPvXsed8QkXQ6BdyqaED7ySSNJyAN8J8c318DpKCUwngmemeX" +"scs11bU88Xg7RJhWwcd6xjATkP9KxurEXizBzGm99Y7f1AuwHSwMFr" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"71" +"75" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\019" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11fsCtryeBMasKPzudhJLnMPMHC1amn2HR88wCvnLcmrUxBcJg2" +"scs11deEDoFvXGQjSLah1h2N13p1PJTVQNqm1qxaSHUhX9HnZGK3wZ" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"89" +"94" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11fsCtryeBMasKPzudhJLnMPMHC1amn2HR88wCvnLcmrUxBcJg2" +"scs11deEDoFvXGQjSLah1h2N13p1PJTVQNqm1qxaSHUhX9HnZGK3wZ" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"89" +"94" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\022" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13PsZc2DSGRhRrdZKHT9wpeLhLrYN5dkD9XZDPu3mYzPd3N8Piu" +"scs13DumkywYF7EtycrHEqToSzBFnYBvJeTA2XUZySvttgXzWWP14d" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"107" +"113" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13PsZc2DSGRhRrdZKHT9wpeLhLrYN5dkD9XZDPu3mYzPd3N8Piu" +"scs13DumkywYF7EtycrHEqToSzBFnYBvJeTA2XUZySvttgXzWWP14d" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"107" +"113" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\025" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12CNZfYDyBvihucTXbD3TLou8WQn55Zk1DrRnLPLHw51Umiku8J" +"scs13RfGYbA1saxvGJMLCySU3tja9MNaqG4CRiWofbCuFiwNofAFCt" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"125" +"132" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12CNZfYDyBvihucTXbD3TLou8WQn55Zk1DrRnLPLHw51Umiku8J" +"scs13RfGYbA1saxvGJMLCySU3tja9MNaqG4CRiWofbCuFiwNofAFCt" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"125" +"132" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\028" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs137sVeLTakoSaACKmjZ77uisWL7LBFQmG57mDLfwZUp6ZqMtYgS" +"scs11vJrzpmNeM3aydKLFC8LN2qzEiLPDW1hYUAWb9aFXKyveoZHGM" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"143" +"151" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs137sVeLTakoSaACKmjZ77uisWL7LBFQmG57mDLfwZUp6ZqMtYgS" +"scs11vJrzpmNeM3aydKLFC8LN2qzEiLPDW1hYUAWb9aFXKyveoZHGM" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"143" +"151" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\031" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11d3KpHobBBVEH5j4xgC3myHPf8sffSvUZWLHVZH7ZcoqGh41A8" +"scs11daEh8MqwPhDawd8n5frMeRhoASh46rnJYNvFz2eSWiVeUfYwS" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"161" +"170" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11d3KpHobBBVEH5j4xgC3myHPf8sffSvUZWLHVZH7ZcoqGh41A8" +"scs11daEh8MqwPhDawd8n5frMeRhoASh46rnJYNvFz2eSWiVeUfYwS" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"161" +"170" ./tezos-sc-rollup-client-alpha get state value for vars/value "\000\000\000\"" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11ZmqpAH3wWYnySzqDFUPU8KL1nNSb8gBx4sBwkU9f11FWtAK22" +"scs12P2MF8NUnH7BrSuRCuSjpBcYpL3ZGJwwm6N3WYkBxvbbwGhdtz" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"180" +"190" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages.out index 019a55a58b21..7370f3750f7f 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages.out @@ -86,16 +86,16 @@ This sequence of operations was run: "\000\000\000\007" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13CGfXJuhF7NnAKY7v3TBokPphzCEYPE5n14UHDnpTAMTAC7GzC" +"scs11brdXnUqwwkqChBy8JsHPVzsS3b6YU9i1PpLczV3tCSnjkTYd1" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"18" +"19" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13CGfXJuhF7NnAKY7v3TBokPphzCEYPE5n14UHDnpTAMTAC7GzC" +"scs11brdXnUqwwkqChBy8JsHPVzsS3b6YU9i1PpLczV3tCSnjkTYd1" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"18" +"19" ./tezos-client --wait none send sc rollup message '["2 8 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -141,16 +141,16 @@ This sequence of operations was run: "\000\000\000\n" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12BVD7ers632i9FZGzaeT4Zt9jQi13guYDh7yb5HFipfVc13wku" +"scs12Tgfr71PpKXJqDp8yXnohfSYoTT57KeRMEi1YacXtRyyvMxjZ4" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"35" +"37" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12BVD7ers632i9FZGzaeT4Zt9jQi13guYDh7yb5HFipfVc13wku" +"scs12Tgfr71PpKXJqDp8yXnohfSYoTT57KeRMEi1YacXtRyyvMxjZ4" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"35" +"37" ./tezos-client --wait none send sc rollup message '["3 10 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -196,16 +196,16 @@ This sequence of operations was run: "\000\000\000\r" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12nXMLncCoT9SGzJX8CwUEG4D1myYhKGYBY6eGvtPrjwqooCovf" +"scs13M1yuX6NMTpdqWgYMx1uAtaLpiCgQAgXK2n93iua2LjfGajSiT" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"53" +"56" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12nXMLncCoT9SGzJX8CwUEG4D1myYhKGYBY6eGvtPrjwqooCovf" +"scs13M1yuX6NMTpdqWgYMx1uAtaLpiCgQAgXK2n93iua2LjfGajSiT" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"53" +"56" ./tezos-client --wait none send sc rollup message '["4 12 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -252,16 +252,16 @@ This sequence of operations was run: "\000\000\000\016" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11tcLMA9CwjW3K3VuAFp4RiJRujh9msGbyMSHyediDMTfchY2JY" +"scs12iwXS6KpaLNTTaBqxFvkyvZpHLq8H5xp35upZ4Tz7Wqtnv68dd" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"71" +"75" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11tcLMA9CwjW3K3VuAFp4RiJRujh9msGbyMSHyediDMTfchY2JY" +"scs12iwXS6KpaLNTTaBqxFvkyvZpHLq8H5xp35upZ4Tz7Wqtnv68dd" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"71" +"75" ./tezos-client --wait none send sc rollup message '["5 14 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -308,16 +308,16 @@ This sequence of operations was run: "\000\000\000\019" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11eYQany2zXFhZ6q62wfrHQA1CYzskBu8k5pnnWnBaAQ3ZEWBK6" +"scs12GyR6dnoCQ3T6NCHe7wCEwzs1FSFdMmKPk8hzvPLMWA9po1vHp" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"89" +"94" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11eYQany2zXFhZ6q62wfrHQA1CYzskBu8k5pnnWnBaAQ3ZEWBK6" +"scs12GyR6dnoCQ3T6NCHe7wCEwzs1FSFdMmKPk8hzvPLMWA9po1vHp" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"89" +"94" ./tezos-client --wait none send sc rollup message '["6 16 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -364,16 +364,16 @@ This sequence of operations was run: "\000\000\000\022" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11ibk6bxp8XcMmHchNkLxniEMGeuu67FYqjeFgsFaK2nSbaj6v6" +"scs13QvpMutd3qKfBeqBUbk719sF8sG2S3PCwbm3nuVr9kib5KA9Vz" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"107" +"113" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11ibk6bxp8XcMmHchNkLxniEMGeuu67FYqjeFgsFaK2nSbaj6v6" +"scs13QvpMutd3qKfBeqBUbk719sF8sG2S3PCwbm3nuVr9kib5KA9Vz" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"107" +"113" ./tezos-client --wait none send sc rollup message '["7 18 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -420,16 +420,16 @@ This sequence of operations was run: "\000\000\000\025" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs1271ctQaBTEibVsSeGQDQwFHaHUhd8EZ1V35wT87wwNkZRKuod2" +"scs12d3sxy4uVnARXJi4KWs3cz5DrmR73Y9ZVk2DkLRXNio9i9yyX4" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"125" +"132" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs1271ctQaBTEibVsSeGQDQwFHaHUhd8EZ1V35wT87wwNkZRKuod2" +"scs12d3sxy4uVnARXJi4KWs3cz5DrmR73Y9ZVk2DkLRXNio9i9yyX4" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"125" +"132" ./tezos-client --wait none send sc rollup message '["8 20 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -477,16 +477,16 @@ This sequence of operations was run: "\000\000\000\028" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12hefiWoaPQGYvPcuUYHhiU5FAAfpBtHcztGqTj6LqB3PxDQiyG" +"scs13CsbaoCfv3vCgBWtL78hQ3sPaH7iVhmCWqBd5hvCqfQWhxje7D" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"143" +"151" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12hefiWoaPQGYvPcuUYHhiU5FAAfpBtHcztGqTj6LqB3PxDQiyG" +"scs13CsbaoCfv3vCgBWtL78hQ3sPaH7iVhmCWqBd5hvCqfQWhxje7D" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"143" +"151" ./tezos-client --wait none send sc rollup message '["9 22 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -534,16 +534,16 @@ This sequence of operations was run: "\000\000\000\031" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11oq2aLp31bKWq7Tp3GccxvZHpaE41PzH7FUQNNKWpYSvUn7Fex" +"scs12TkBvyg8cSuoNGfrzwM516T9isZwxAphpo7AnxJYVyPGWDwybq" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"161" +"170" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11oq2aLp31bKWq7Tp3GccxvZHpaE41PzH7FUQNNKWpYSvUn7Fex" +"scs12TkBvyg8cSuoNGfrzwM516T9isZwxAphpo7AnxJYVyPGWDwybq" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"161" +"170" ./tezos-client --wait none send sc rollup message '["10 24 + value"]' from bootstrap2 to '[SC_ROLLUP_HASH]' Node is bootstrapped. @@ -591,7 +591,7 @@ This sequence of operations was run: "\000\000\000\"" ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs12z8UFkMz6jxQo5hDNhBz96Pjq31V8fSBz3kH3DPgVhpfQFe6Fk" +"scs13GcPbRV1mSUravbXkE3LFT2SgEGu2muVHjNzKumLC91MikErA8" ./tezos-sc-rollup-client-alpha rpc get /global/total_ticks -"180" +"190" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_at_genesis).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_at_genesis).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_at_genesis).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_at_genesis).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_many_empty_level.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_many_empty_level.out index ed0e5ab11a32..08fcc319399a 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_many_empty_level.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_many_empty_level.out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs1365PwjPUZLhbhaq43gZrRYipFXhourfJzEvb37Hu3TTTgbx8y8" +"scs11aAQ1SepzwgYmEjnH8hiwGsJt2Gp1sh27mPQof7fvYvMEmYQVf" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_one_empty_level).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_one_empty_level).out index 63a82ca2ea2e..3966f1d1226b 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_one_empty_level).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (inbox_proof_one_empty_level).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11ZMT1cDjKYohJNsfd5EB8VYeNansvn3or3tD8ESph72HBGY7LJ" +"scs12zTfsE1ur7A3sjDj2y4sQcg599nnyPyQoMf6fSLYh1Xor7njcv" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_0).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_0).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_0).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_1).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_1).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_1).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_1).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_2).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_2).out index a940cb3d0731..37db5b30a818 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_2).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_2).out @@ -317,4 +317,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs129jabM73KJiKFwDoXtRtcxLa8qP2Q2sTgFJJbwnXdPm5oaK1ta" +"scs12oKDGwdZ4UkEhXQzDjVzG2cGKRzynqHmHa6XjgbpnMmYzgfwJb" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_3).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_3).out index db6e18388b17..4091fdf7d7b2 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_3).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_3).out @@ -317,4 +317,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs11beC6SWs4SDoqDB5qagJdkFFpqMYaZrjb9ScQpkkoku7ee56S1" +"scs126QNuQZhsoqp3hjoXPYoLJbkh599zuUnch6kzc1pdZAR1KVTXb" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_at_genesis).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_at_genesis).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_at_genesis).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (pvm_proof_at_genesis).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (timeout).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (timeout).out index c691e4d5b79b..226d686e2a62 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (timeout).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - refutation games winning strategies (timeout).out @@ -443,4 +443,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs13AnJRSjXmxUNK3AcEfpGoUzMxY85Vd5SU3WVmPC56RsTARtyb8" +"scs127KQCwoyzRkAn9gvSeNRkvs1MYYaEVHRaJ7bmrkuNHKo91Hsrn" diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (batcher_does_not_p.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (batcher_does_not_p.out index da29f3207efc..e57094b1b978 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (batcher_does_not_p.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (batcher_does_not_p.out @@ -2619,10 +2619,10 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (commitment_is_stor.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (commitment_is_stor.out index 2cda5a2607bc..8834aab67a3e 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (commitment_is_stor.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (commitment_is_stor.out @@ -1304,18 +1304,18 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/last_stored_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]" } ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (maintenance_publis.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (maintenance_publis.out index 1293fdb5eaa5..183f97f149d4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (maintenance_publis.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (maintenance_publis.out @@ -2619,19 +2619,19 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (messages_reset).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (messages_reset).out index 3b68df079d26..bfdd33f6d123 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (messages_reset).out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (messages_reset).out @@ -1304,7 +1304,7 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/last_stored_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 62, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", "number_of_ticks": 0 }, @@ -1313,7 +1313,7 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 62, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", "number_of_ticks": 0 }, diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (node_use_proto_par.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (node_use_proto_par.out index 1ffffb9aef73..5515a26e7dcf 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (node_use_proto_par.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (node_use_proto_par.out @@ -659,18 +659,18 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/last_stored_commitment { "commitment": { "compressed_state": - "scs128vEZa7hXxUCcuBtKqdMfTCGejmEe5aoxLBS6csdWApTULy4TY", + "scs12wTPaomFH2grjoXSuBwnVppABH3RvbaghhnskeG6GYpbEbZ3fg", "inbox_level": 17, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 241 }, + "number_of_ticks": 361 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]" } ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs128vEZa7hXxUCcuBtKqdMfTCGejmEe5aoxLBS6csdWApTULy4TY", + "scs12wTPaomFH2grjoXSuBwnVppABH3RvbaghhnskeG6GYpbEbZ3fg", "inbox_level": 17, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 241 }, + "number_of_ticks": 361 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 20 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (observer_does_not_.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (observer_does_not_.out index da29f3207efc..e57094b1b978 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (observer_does_not_.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (observer_does_not_.out @@ -2619,10 +2619,10 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (operator_publishes.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (operator_publishes.out index 1293fdb5eaa5..183f97f149d4 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (operator_publishes.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (operator_publishes.out @@ -2619,19 +2619,19 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } ./tezos-sc-rollup-client-alpha rpc get /local/last_published_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]", "published_at_level": 35 } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (robust_to_failures.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (robust_to_failures.out index 7592e1dee9c2..9a2f5a8ba860 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (robust_to_failures.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (robust_to_failures.out @@ -1304,17 +1304,17 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/last_stored_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]" } ./tezos-sc-rollup-client-alpha rpc get /global/last_stored_commitment { "commitment": { "compressed_state": - "scs12A4jtbi39DFb3fzb3EBcJGB6hcsUxugy62zf11pQyk1eMMqWjP", + "scs123mHW8JnxvBJvMvySAKp99M3Ekvb5ntV5eLQkRJNVexjgXzTK8", "inbox_level": 32, "predecessor": "[SC_ROLLUP_COMMITMENT_HASH]", - "number_of_ticks": 931 }, + "number_of_ticks": 1396 }, "hash": "[SC_ROLLUP_COMMITMENT_HASH]" } diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- ensure arith boot sector is used.out b/tezt/tests/expected/sc_rollup.ml/Alpha- ensure arith boot sector is used.out index 8c5bab4c1f42..a6f11a44fbf0 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- ensure arith boot sector is used.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- ensure arith boot sector is used.out @@ -77,7 +77,7 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs1371W53YVrt8USjs6PafacnNV6ZoFr4VjvyKP9UYszqdg5v4ZC7" +"scs12va7N5ovc2CYcBAsWNki5APZFZp4JaCYqUe2a1FjYnQvp4iUHJ" ./tezos-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with 31 --burn-cap 9999999 Node is bootstrapped. @@ -157,4 +157,4 @@ This sequence of operations was run: ./tezos-sc-rollup-client-alpha rpc get /global/state_hash -"scs133L8aujCeqJqKx57baw8LMN3CJM6iPTU1tdV72Y171fZpuofKV" +"scs11ogaqyuvGvcJQFX3pHzPzGMCCJVdYMbR1mVmYnWKPkorSvRJGr" -- GitLab