diff --git a/client-libs/kaitai-struct-files/files/id_019__ptparisa__frozen_staker.ksy b/client-libs/kaitai-struct-files/files/id_019__ptparisa__frozen_staker.ksy index 7d9e72c2590f66fb595356aea6783ce3a6674fd4..bac6b9784ebf9b84d320190670e4e38f04626201 100644 --- a/client-libs/kaitai-struct-files/files/id_019__ptparisa__frozen_staker.ksy +++ b/client-libs/kaitai-struct-files/files/id_019__ptparisa__frozen_staker.ksy @@ -31,6 +31,10 @@ types: type: public_key_hash if: (id_019__ptparisa__frozen_staker_tag == id_019__ptparisa__frozen_staker_tag::baker) doc: A Ed25519, Secp256k1, P256, or BLS public key hash + - id: baker_edge + type: public_key_hash + if: (id_019__ptparisa__frozen_staker_tag == id_019__ptparisa__frozen_staker_tag::baker_edge) + doc: A Ed25519, Secp256k1, P256, or BLS public key hash originated: seq: - id: contract_hash @@ -73,6 +77,7 @@ enums: 0: single 1: shared 2: baker + 3: baker_edge public_key_hash_tag: 0: ed25519 1: secp256k1 diff --git a/client-libs/kaitai-struct-files/files/id_019__ptparisa__receipt__balance_updates.ksy b/client-libs/kaitai-struct-files/files/id_019__ptparisa__receipt__balance_updates.ksy index 3b35d4056d8fbb228fa408a9dc4413f2d2b6d3f8..eb3fd2c48927ec855479ffc4e93ed07bf679e920 100644 --- a/client-libs/kaitai-struct-files/files/id_019__ptparisa__receipt__balance_updates.ksy +++ b/client-libs/kaitai-struct-files/files/id_019__ptparisa__receipt__balance_updates.ksy @@ -74,6 +74,10 @@ types: type: public_key_hash if: (id_019__ptparisa__frozen_staker_tag == id_019__ptparisa__frozen_staker_tag::baker) doc: A Ed25519, Secp256k1, P256, or BLS public key hash + - id: baker_edge + type: public_key_hash + if: (id_019__ptparisa__frozen_staker_tag == id_019__ptparisa__frozen_staker_tag::baker_edge) + doc: A Ed25519, Secp256k1, P256, or BLS public key hash id_019__ptparisa__operation_metadata__alpha__balance_and_update: seq: - id: id_019__ptparisa__operation_metadata__alpha__balance_and_update_tag @@ -307,6 +311,7 @@ enums: 0: single 1: shared 2: baker + 3: baker_edge id_019__ptparisa__operation_metadata__alpha__balance_and_update_tag: 0: contract 2: block_fees diff --git a/docs/Makefile b/docs/Makefile index 0bb942c48a0d693b862b0396b9e2b5125060382a..5bcc562a7e0d159179681583e359cfe19acaa47d 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -20,7 +20,7 @@ PROTOCOLS = $(NAMED_PROTOS) alpha # The following variables names are lowercase, so their names can be computed # from the names of the corresponding protocol directories -paris_long = PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 +paris_long = PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc oxford_long = ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH alpha_long = ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK diff --git a/docs/api/paris-mempool-openapi-dev.json b/docs/api/paris-mempool-openapi-dev.json index 0346f4b61d02018cb2ac6c088214a8f9d3216a81..103c852342bfe45dda5daeffbcae30d890cc824a 100644 --- a/docs/api/paris-mempool-openapi-dev.json +++ b/docs/api/paris-mempool-openapi-dev.json @@ -3,7 +3,7 @@ "info": { "title": "Octez Mempool RPC", "description": "The RPC API for the mempool served by the Octez node.", - "version": "19.1+dev (72118d1e)" + "version": "Octez 0.0+dev (4fe3cc43)" }, "paths": { "/pending_operations": { @@ -19,15 +19,6 @@ "type": "string" } }, - { - "name": "applied", - "in": "query", - "description": "(DEPRECATED use validated instead) Include validated operations", - "required": false, - "schema": { - "type": "string" - } - }, { "name": "validated", "in": "query", diff --git a/docs/api/paris-openapi-dev.json b/docs/api/paris-openapi-dev.json index 8432501fa18d04b5bf2c50cee480822a0200f104..63b13eeffcdabfae6b53726fd88ada3d5ce1bd73 100644 --- a/docs/api/paris-openapi-dev.json +++ b/docs/api/paris-openapi-dev.json @@ -3,7 +3,7 @@ "info": { "title": "Octez Protocol paris RPC", "description": "The RPC API for protocol paris served by the Octez node.", - "version": "19.1+dev (72118d1e)" + "version": "Octez 0.0+dev (4fe3cc43)" }, "paths": { "/": { @@ -3576,7 +3576,7 @@ }, "/context/dal/shards": { "get": { - "description": "Get the shard assignements for a given level (the default is the current level)", + "description": "Get the shards assignment for a given level (the default is the current level) and given delegates (the default is all delegates)", "parameters": [ { "name": "level", @@ -3586,6 +3586,15 @@ "schema": { "type": "string" } + }, + { + "name": "delegates", + "in": "query", + "description": "A Secp256k1 of a Ed25519 public key hash (Base58Check-encoded)", + "required": false, + "schema": { + "type": "string" + } } ], "responses": { @@ -3596,31 +3605,24 @@ "schema": { "type": "array", "items": { - "type": "array", - "items": { - "oneOf": [ - { - "$ref": "#/components/schemas/Signature.Public_key_hash" - }, - { - "type": "array", - "items": { - "oneOf": [ - { - "type": "integer", - "minimum": -32768, - "maximum": 32767 - }, - { - "type": "integer", - "minimum": -32768, - "maximum": 32767 - } - ] - } + "type": "object", + "properties": { + "delegate": { + "$ref": "#/components/schemas/Signature.Public_key_hash" + }, + "indexes": { + "type": "array", + "items": { + "type": "integer", + "minimum": -32768, + "maximum": 32767 } - ] - } + } + }, + "required": [ + "delegate", + "indexes" + ] } } } @@ -3750,7 +3752,55 @@ "$ref": "#/components/schemas/019-PtParisA.mutez" }, "min_delegated_in_current_cycle": { - "$ref": "#/components/schemas/019-PtParisA.mutez" + "type": "object", + "properties": { + "amount": { + "$ref": "#/components/schemas/019-PtParisA.mutez" + }, + "level": { + "type": "object", + "properties": { + "level": { + "description": "The level of the block relative to genesis. This is also the Shell's notion of level.", + "type": "integer", + "minimum": 0, + "maximum": 2147483647 + }, + "level_position": { + "description": "The level of the block relative to the successor of the genesis block. More precisely, it is the position of the block relative to the block that starts the \"Alpha family\" of protocols, which includes all protocols except Genesis (that is, from 001 onwards).", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "cycle": { + "description": "The current cycle's number. Note that cycles are a protocol-specific notion. As a result, the cycle number starts at 0 with the first block of the Alpha family of protocols.", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "cycle_position": { + "description": "The current level of the block relative to the first block of the current cycle.", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "expected_commitment": { + "description": "Tells whether the baker of this block has to commit a seed nonce hash.", + "type": "boolean" + } + }, + "required": [ + "level", + "level_position", + "cycle", + "cycle_position", + "expected_commitment" + ] + } + }, + "required": [ + "amount" + ] }, "deactivated": { "type": "boolean" @@ -4502,9 +4552,47 @@ } } }, + "/context/delegates/{pkh}/is_forbidden": { + "get": { + "description": "Returns true if the delegate is forbidden to participate in consensus.", + "parameters": [ + { + "name": "pkh", + "in": "path", + "description": "A Secp256k1 of a Ed25519 public key hash (Base58Check-encoded)", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "default": { + "description": "", + "content": { + "application/json": { + "schema": { + "description": "The full list of errors is available with the global RPC `GET errors`" + } + } + } + } + } + } + }, "/context/delegates/{pkh}/min_delegated_in_current_cycle": { "get": { - "description": "Returns the minimum of delegated tez (in mutez) over the current cycle.", + "description": "Returns the minimum of delegated tez (in mutez) over the current cycle and the block level where this value was last updated (* Level is `None` when decoding values from protocol O).", "parameters": [ { "name": "pkh", @@ -4522,7 +4610,55 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/positive_bignum" + "type": "object", + "properties": { + "amount": { + "$ref": "#/components/schemas/019-PtParisA.mutez" + }, + "level": { + "type": "object", + "properties": { + "level": { + "description": "The level of the block relative to genesis. This is also the Shell's notion of level.", + "type": "integer", + "minimum": 0, + "maximum": 2147483647 + }, + "level_position": { + "description": "The level of the block relative to the successor of the genesis block. More precisely, it is the position of the block relative to the block that starts the \"Alpha family\" of protocols, which includes all protocols except Genesis (that is, from 001 onwards).", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "cycle": { + "description": "The current cycle's number. Note that cycles are a protocol-specific notion. As a result, the cycle number starts at 0 with the first block of the Alpha family of protocols.", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "cycle_position": { + "description": "The current level of the block relative to the first block of the current cycle.", + "type": "integer", + "minimum": -2147483648, + "maximum": 2147483647 + }, + "expected_commitment": { + "description": "Tells whether the baker of this block has to commit a seed nonce hash.", + "type": "boolean" + } + }, + "required": [ + "level", + "level_position", + "cycle", + "cycle_position", + "expected_commitment" + ] + } + }, + "required": [ + "amount" + ] } } } @@ -5239,7 +5375,7 @@ }, "/context/issuance/expected_issuance": { "get": { - "description": "Returns the expected issued tez for the provided block and the next five cycles", + "description": "Returns the expected issued tez for the provided block and the next 'consensus_rights_delay' cycles", "responses": { "200": { "description": "", @@ -8650,7 +8786,7 @@ "protocol": { "type": "string", "enum": [ - "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5" + "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc" ] }, "payload_hash": { @@ -12781,12 +12917,24 @@ "title": "Baker", "type": "object", "properties": { - "baker": { + "baker_own_stake": { + "$ref": "#/components/schemas/Signature.Public_key_hash" + } + }, + "required": [ + "baker_own_stake" + ] + }, + { + "title": "Baker_edge", + "type": "object", + "properties": { + "baker_edge": { "$ref": "#/components/schemas/Signature.Public_key_hash" } }, "required": [ - "baker" + "baker_edge" ] } ] @@ -27056,7 +27204,7 @@ "next_protocol": { "type": "string", "enum": [ - "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5" + "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc" ] }, "test_chain_status": { @@ -27122,7 +27270,7 @@ "next_protocol": { "type": "string", "enum": [ - "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5" + "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc" ] }, "test_chain_status": { @@ -27517,7 +27665,7 @@ "protocol": { "type": "string", "enum": [ - "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5" + "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc" ] }, "branch": { @@ -27546,7 +27694,7 @@ "protocol": { "type": "string", "enum": [ - "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5" + "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc" ] }, "branch": { diff --git a/docs/api/paris-smart-rollup-node-openapi-dev.json b/docs/api/paris-smart-rollup-node-openapi-dev.json index 73b4a9e4605798bec91da3974007216f25f0c9ae..97b3cafb9c48be4108e59f5715d33a8c19d0aec2 100644 --- a/docs/api/paris-smart-rollup-node-openapi-dev.json +++ b/docs/api/paris-smart-rollup-node-openapi-dev.json @@ -2,8 +2,8 @@ "info": { "title": "Smart Rollup Node RPCs", "description": - "Smart Rollup Node RPC API for protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5", - "version": "19.1+dev (72118d1e)" }, + "Smart Rollup Node RPC API for protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc", + "version": "Octez 0.0+dev (4fe3cc43)" }, "paths": { "/describe": { "get": @@ -1377,11 +1377,11 @@ { "application/json": { "schema": { "description": - "Hashes of injected L2 messages", + "Ids of injected L2 messages", "type": "array", "items": { "$ref": - "#/components/schemas/sc_rollup_l2_message" } } } } }, + "#/components/schemas/sc_rollup_l2_message_id" } } } } }, "default": { "description": "", "content": @@ -1402,9 +1402,9 @@ "items": { "type": "object", "properties": - { "hash": + { "id": { "$ref": - "#/components/schemas/sc_rollup_l2_message" }, + "#/components/schemas/sc_rollup_l2_message_id" }, "message": { "type": "object", "properties": @@ -1416,7 +1416,7 @@ "#/components/schemas/sc_l2_message" } }, "required": [ "counter", "content" ] } }, - "required": [ "hash", "message" ] } } } } }, + "required": [ "id", "message" ] } } } } }, "default": { "description": "", "content": @@ -1424,12 +1424,12 @@ { "schema": { "description": "The full list of errors is available with the global RPC `GET errors`" } } } } } } }, - "/local/batcher/queue/{l2_message_hash}": + "/local/batcher/queue/{l2_message_id}": { "get": { "description": "Retrieve an L2 message and its status", "parameters": - [ { "name": "l2_message_hash", "in": "path", - "description": "A L2 message hash.", "required": true, + [ { "name": "l2_message_id", "in": "path", + "description": "A L2 message id.", "required": true, "schema": { "type": "string" } } ], "responses": { "200": @@ -1788,6 +1788,50 @@ { "schema": { "description": "The full list of errors is available with the global RPC `GET errors`" } } } } } } }, + "/local/synchronized": + { "get": + { "description": + "Wait for the node to have synchronized its L2 chain with the L1 chain, streaming its progress.", + "responses": + { "200": + { "description": "", + "content": + { "application/json": + { "schema": + { "oneOf": + [ { "title": "synchronized", + "type": "string", + "enum": [ "synchronized" ] }, + { "title": "synchronizing", + "type": "object", + "properties": + { "synchronizing": + { "type": "object", + "properties": + { "processed_level": + { "type": "integer", + "minimum": + -2147483648, + "maximum": 2147483647 }, + "l1_head_level": + { "type": "integer", + "minimum": + -2147483648, + "maximum": 2147483647 }, + "percentage_done": + { "type": "number" } }, + "required": + [ "processed_level", + "l1_head_level", + "percentage_done" ] } }, + "required": [ "synchronizing" ] } ] } } } }, + "default": + { "description": "", + "content": + { "application/json": + { "schema": + { "description": + "The full list of errors is available with the global RPC `GET errors`" } } } } } } }, "/openapi": { "get": { "description": "OpenAPI specification of RPCs for rollup node", @@ -2020,8 +2064,9 @@ "sc_l2_message": { "description": "A hex encoded smart rollup message", "type": "string", "pattern": "^([a-zA-Z0-9][a-zA-Z0-9])*$" }, - "sc_rollup_l2_message": - { "title": "A smart rollup layer 2 message (Base58Check-encoded)", + "sc_rollup_l2_message_id": + { "title": + "A smart rollup layer 2 message identifier (Base58Check-encoded)", "oneOf": [ { "$ref": "#/components/schemas/unistring" } ] }, "sc_rollup_node_l1_operation": { "oneOf": diff --git a/docs/oxford/rpc.rst b/docs/oxford/rpc.rst index 6d26ac9767472a644f9d288748d9510dd2979587..1f9fdb771be3ab3da2a3f13f3b1dcc83b893db05 100644 --- a/docs/oxford/rpc.rst +++ b/docs/oxford/rpc.rst @@ -78,7 +78,6 @@ -.. _rpc_index: .. _rpc_index_oxford : Oxford RPCs - Reference @@ -7447,7 +7446,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -8648,7 +8647,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_96 | + | slot_header | 145 bytes | $X_96 | +---------------+----------------------+------------------------+ @@ -11224,7 +11223,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_96 | + | slot_header | 145 bytes | $X_96 | +---------------+----------------------+------------------------+ | metadata | Determined from data | $X_548 | +---------------+----------------------+------------------------+ @@ -12043,7 +12042,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_96 | + | slot_header | 145 bytes | $X_96 | +---------------+----------------------+------------------------+ @@ -29175,7 +29174,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -30445,7 +30444,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_19 | + | slot_header | 145 bytes | $X_19 | +---------------+----------------------+------------------------+ @@ -32698,7 +32697,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -34061,7 +34060,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ @@ -38577,7 +38576,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -39940,7 +39939,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_18 | + | slot_header | 145 bytes | $X_18 | +---------------+----------------------+------------------------+ @@ -43348,7 +43347,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_18 | + | slot_header | 145 bytes | $X_18 | +---------------+----------------------+------------------------+ | metadata | Determined from data | $X_470 | +---------------+----------------------+------------------------+ @@ -52375,7 +52374,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -53738,7 +53737,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_18 | + | slot_header | 145 bytes | $X_18 | +---------------+----------------------+------------------------+ @@ -57146,7 +57145,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_18 | + | slot_header | 145 bytes | $X_18 | +---------------+----------------------+------------------------+ | metadata | Determined from data | $X_470 | +---------------+----------------------+------------------------+ @@ -57965,7 +57964,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_18 | + | slot_header | 145 bytes | $X_18 | +---------------+----------------------+------------------------+ @@ -62625,7 +62624,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -63988,7 +63987,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ @@ -67396,7 +67395,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ | metadata | Determined from data | $X_469 | +---------------+----------------------+------------------------+ @@ -68215,7 +68214,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ @@ -72869,7 +72868,7 @@ Full description +------------------+----------+------------------------+ | commitment | 48 bytes | bytes | +------------------+----------+------------------------+ - | commitment_proof | 48 bytes | bytes | + | commitment_proof | 96 bytes | bytes | +------------------+----------+------------------------+ @@ -74232,7 +74231,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ @@ -77640,7 +77639,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ | metadata | Determined from data | $X_469 | +---------------+----------------------+------------------------+ @@ -78459,7 +78458,7 @@ Full description +---------------+----------------------+------------------------+ | storage_limit | Determined from data | $N.t | +---------------+----------------------+------------------------+ - | slot_header | 97 bytes | $X_17 | + | slot_header | 145 bytes | $X_17 | +---------------+----------------------+------------------------+ diff --git a/docs/paris/rpc.rst b/docs/paris/rpc.rst index 3f8b38b67bf815119b33c147a0684a185986d27e..11874453c1f4f80a078a14ae98b66ea85972bad2 100644 --- a/docs/paris/rpc.rst +++ b/docs/paris/rpc.rst @@ -355,14 +355,14 @@ Full description
     { /* block_info_encoding_v1 */
-      "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "header": $raw_block_header,
       "metadata"?: $block_header_metadata,
       "operations": [ [ $operation ... ] ... ] }
     || { /* block_info_encoding_v0 */
-         "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+         "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
          "chain_id": $Chain_id,
          "hash": $block_hash,
          "header": $raw_block_header,
@@ -473,7 +473,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.inlined.attestation:
       /* An operation's shell header. */
       { "branch": $block_hash,
@@ -4620,8 +4622,8 @@ Full description
       /* A block identifier (Base58Check-encoded) */
       $unistring
     $block_header_metadata:
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
-        "next_protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
+        "next_protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -4697,8 +4699,8 @@ Full description
         "consumed_milligas": $positive_bignum,
         "dal_attestation": $bignum }
     $block_header_metadata_with_legacy_attestation_name:
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
-        "next_protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
+        "next_protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -4804,7 +4806,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -4812,14 +4814,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $019-PtParisA.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4827,7 +4829,7 @@ Full description
              [ $019-PtParisA.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4835,7 +4837,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -4844,7 +4846,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4852,7 +4854,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4860,7 +4862,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -5461,13 +5463,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_9 (Determined from data, 8-bit tag)
@@ -19853,7 +19867,34 @@ Full description
       "frozen_deposits_limit"?: $019-PtParisA.mutez,
       "delegated_contracts": [ $019-PtParisA.contract_id ... ],
       "delegated_balance": $019-PtParisA.mutez,
-      "min_delegated_in_current_cycle": $019-PtParisA.mutez,
+      "min_delegated_in_current_cycle":
+        { "amount": $019-PtParisA.mutez,
+          "level"?:
+            { "level":
+                integer ∈ [0, 2^31]
+                /* The level of the block relative to genesis. This is also the
+                   Shell's notion of level. */,
+              "level_position":
+                integer ∈ [-2^31-1, 2^31]
+                /* The level of the block relative to the successor of the
+                   genesis block. More precisely, it is the position of the
+                   block relative to the block that starts the "Alpha family"
+                   of protocols, which includes all protocols except Genesis
+                   (that is, from 001 onwards). */,
+              "cycle":
+                integer ∈ [-2^31-1, 2^31]
+                /* The current cycle's number. Note that cycles are a
+                   protocol-specific notion. As a result, the cycle number
+                   starts at 0 with the first block of the Alpha family of
+                   protocols. */,
+              "cycle_position":
+                integer ∈ [-2^31-1, 2^31]
+                /* The current level of the block relative to the first block
+                   of the current cycle. */,
+              "expected_commitment":
+                boolean
+                /* Tells whether the baker of this block has to commit a seed
+                   nonce hash. */ } },
       "deactivated": boolean,
       "grace_period": integer ∈ [-2^31-1, 2^31],
       "pending_denunciations": boolean,
@@ -19917,7 +19958,7 @@ Full description
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
     | delegated_balance                           | Determined from data | $N.t                                                         |
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
-    | min_delegated_in_current_cycle              | Determined from data | $N.t                                                         |
+    | min_delegated_in_current_cycle              | Determined from data | $X_0                                                         |
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
     | deactivated                                 | 1 byte               | boolean (0 for false, 255 for true)                          |
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
@@ -19947,7 +19988,7 @@ Full description
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
     | # bytes in next field                       | 4 bytes              | unsigned 30-bit integer                                      |
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
-    | pending_consensus_keys                      | Variable             | sequence of $X_0                                             |
+    | pending_consensus_keys                      | Variable             | sequence of $X_2                                             |
     +---------------------------------------------+----------------------+--------------------------------------------------------------+
     
     
@@ -20043,9 +20084,41 @@ Full description
     +---------------+----------+------------------------+
     
     
+    X_1
+    ***
+    
+    +---------------------+---------+-------------------------------------+
+    | Name                | Size    | Contents                            |
+    +=====================+=========+=====================================+
+    | level               | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | level_position      | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | cycle               | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | cycle_position      | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | expected_commitment | 1 byte  | boolean (0 for false, 255 for true) |
+    +---------------------+---------+-------------------------------------+
+    
+    
     X_0
     ***
     
+    +-----------------------------+----------------------+-------------------------------------+
+    | Name                        | Size                 | Contents                            |
+    +=============================+======================+=====================================+
+    | amount                      | Determined from data | $N.t                                |
+    +-----------------------------+----------------------+-------------------------------------+
+    | ? presence of field "level" | 1 byte               | boolean (0 for false, 255 for true) |
+    +-----------------------------+----------------------+-------------------------------------+
+    | level                       | 17 bytes             | $X_1                                |
+    +-----------------------------+----------------------+-------------------------------------+
+    
+    
+    X_2
+    ***
+    
     +-------+----------+-----------------------+
     | Name  | Size     | Contents              |
     +=======+==========+=======================+
@@ -20977,11 +21050,37 @@ Full description
     
     

- Returns the minimum of delegated tez (in mutez) over the current cycle.

+ Returns the minimum of delegated tez (in mutez) over the current cycle and the block level where this value was last updated (* Level is `None` when decoding values from protocol O).

-    $positive_bignum
+    { "amount": $019-PtParisA.mutez,
+      "level"?:
+        { "level":
+            integer ∈ [0, 2^31]
+            /* The level of the block relative to genesis. This is also the
+               Shell's notion of level. */,
+          "level_position":
+            integer ∈ [-2^31-1, 2^31]
+            /* The level of the block relative to the successor of the genesis
+               block. More precisely, it is the position of the block relative
+               to the block that starts the "Alpha family" of protocols, which
+               includes all protocols except Genesis (that is, from 001
+               onwards). */,
+          "cycle":
+            integer ∈ [-2^31-1, 2^31]
+            /* The current cycle's number. Note that cycles are a
+               protocol-specific notion. As a result, the cycle number starts
+               at 0 with the first block of the Alpha family of protocols. */,
+          "cycle_position":
+            integer ∈ [-2^31-1, 2^31]
+            /* The current level of the block relative to the first block of
+               the current cycle. */,
+          "expected_commitment":
+            boolean
+            /* Tells whether the baker of this block has to commit a seed nonce
+               hash. */ } }
+    $019-PtParisA.mutez: $positive_bignum
     $positive_bignum:
       /* Positive big number
          Decimal representation of a positive big number */
@@ -20989,11 +21088,15 @@ Full description
     
-    +-----------------+----------------------+----------+
-    | Name            | Size                 | Contents |
-    +=================+======================+==========+
-    | Unnamed field 0 | Determined from data | $N.t     |
-    +-----------------+----------------------+----------+
+    +-----------------------------+----------------------+-------------------------------------+
+    | Name                        | Size                 | Contents                            |
+    +=============================+======================+=====================================+
+    | amount                      | Determined from data | $N.t                                |
+    +-----------------------------+----------------------+-------------------------------------+
+    | ? presence of field "level" | 1 byte               | boolean (0 for false, 255 for true) |
+    +-----------------------------+----------------------+-------------------------------------+
+    | level                       | 17 bytes             | $X_0                                |
+    +-----------------------------+----------------------+-------------------------------------+
     
     
     N.t
@@ -21007,6 +21110,24 @@ Full description
     | N.t  | Determined from data | bytes    |
     +------+----------------------+----------+
     
+    
+    X_0
+    ***
+    
+    +---------------------+---------+-------------------------------------+
+    | Name                | Size    | Contents                            |
+    +=====================+=========+=====================================+
+    | level               | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | level_position      | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | cycle               | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | cycle_position      | 4 bytes | signed 32-bit integer               |
+    +---------------------+---------+-------------------------------------+
+    | expected_commitment | 1 byte  | boolean (0 for false, 255 for true) |
+    +---------------------+---------+-------------------------------------+
+    
     
@@ -21732,7 +21853,7 @@ Full description

- Returns the expected issued tez for the provided block and the next five cycles

+ Returns the expected issued tez for the provided block and the next 'consensus_rights_delay' cycles

@@ -26567,7 +26688,7 @@ Full description
     { /* Shell header
          Block header's shell-related content. It contains information such as
          the block level, its predecessor and timestamp. */
-      "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "level": integer ∈ [-2^31-1, 2^31],
@@ -26791,7 +26912,7 @@ Full description
             
-    { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+    { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
       "payload_hash": $value_hash,
       "payload_round": integer ∈ [-2^31-1, 2^31],
       "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -27273,7 +27394,7 @@ Full description
   
     { "protocol_data":
-        { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
           "payload_hash": $value_hash,
           "payload_round": integer ∈ [-2^31-1, 2^31],
           "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -28300,13 +28421,13 @@ Full description
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": $block_hash,
         "contents": [ $019-PtParisA.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
     $next_operation_with_legacy_attestation_name:
       /* An operation's shell header. */
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": $block_hash,
         "contents":
           [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
@@ -31987,13 +32108,13 @@ Full description
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": $block_hash,
         "contents": [ $019-PtParisA.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
     $next_operation_with_legacy_attestation_name:
       /* An operation's shell header. */
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": $block_hash,
         "contents":
           [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
@@ -34504,7 +34625,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.inlined.attestation:
       /* An operation's shell header. */
       { "branch": $block_hash,
@@ -40375,13 +40498,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_42 (Determined from data, 8-bit tag)
@@ -43863,7 +43998,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.lazy_storage_diff:
       [ { /* big_map */
           "kind": "big_map",
@@ -45506,8 +45643,8 @@ Full description
       /* A block identifier (Base58Check-encoded) */
       $unistring
     $block_header_metadata:
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
-        "next_protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
+        "next_protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -45583,8 +45720,8 @@ Full description
         "consumed_milligas": $positive_bignum,
         "dal_attestation": $bignum }
     $block_header_metadata_with_legacy_attestation_name:
-      { "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
-        "next_protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+      { "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
+        "next_protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -46139,13 +46276,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_8 (Determined from data, 8-bit tag)
@@ -47987,7 +48136,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.inlined.attestation:
       /* An operation's shell header. */
       { "branch": $block_hash,
@@ -51439,7 +51590,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -51447,14 +51598,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $019-PtParisA.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51462,7 +51613,7 @@ Full description
              [ $019-PtParisA.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51470,7 +51621,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -51479,7 +51630,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51487,7 +51638,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51495,7 +51646,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -53933,13 +54084,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_42 (Determined from data, 8-bit tag)
@@ -58313,7 +58476,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.inlined.attestation:
       /* An operation's shell header. */
       { "branch": $block_hash,
@@ -61765,7 +61930,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -61773,14 +61938,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $019-PtParisA.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61788,7 +61953,7 @@ Full description
              [ $019-PtParisA.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61796,7 +61961,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -61805,7 +61970,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61813,7 +61978,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61821,7 +61986,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -64259,13 +64424,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_41 (Determined from data, 8-bit tag)
@@ -68625,7 +68802,9 @@ Full description
       || { /* Shared */
            "delegate": $Signature.Public_key_hash }
       || { /* Baker */
-           "baker": $Signature.Public_key_hash }
+           "baker_own_stake": $Signature.Public_key_hash }
+      || { /* Baker_edge */
+           "baker_edge": $Signature.Public_key_hash }
     $019-PtParisA.inlined.attestation:
       /* An operation's shell header. */
       { "branch": $block_hash,
@@ -72077,7 +72256,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -72085,14 +72264,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $019-PtParisA.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -72100,7 +72279,7 @@ Full description
              [ $019-PtParisA.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -72108,7 +72287,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -72117,7 +72296,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -72125,7 +72304,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -72133,7 +72312,7 @@ Full description
              [ $019-PtParisA.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+           "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -74579,13 +74758,25 @@ Full description
     Baker (tag 2)
     =============
     
-    +-------+----------+------------------------+
-    | Name  | Size     | Contents               |
-    +=======+==========+========================+
-    | Tag   | 1 byte   | unsigned 8-bit integer |
-    +-------+----------+------------------------+
-    | baker | 21 bytes | $public_key_hash       |
-    +-------+----------+------------------------+
+    +-----------------+----------+------------------------+
+    | Name            | Size     | Contents               |
+    +=================+==========+========================+
+    | Tag             | 1 byte   | unsigned 8-bit integer |
+    +-----------------+----------+------------------------+
+    | baker_own_stake | 21 bytes | $public_key_hash       |
+    +-----------------+----------+------------------------+
+    
+    
+    Baker_edge (tag 3)
+    ==================
+    
+    +------------+----------+------------------------+
+    | Name       | Size     | Contents               |
+    +============+==========+========================+
+    | Tag        | 1 byte   | unsigned 8-bit integer |
+    +------------+----------+------------------------+
+    | baker_edge | 21 bytes | $public_key_hash       |
+    +------------+----------+------------------------+
     
     
     X_41 (Determined from data, 8-bit tag)
diff --git a/src/lib_protocol_compiler/final_protocol_versions b/src/lib_protocol_compiler/final_protocol_versions
index 118f4a10b0d477db6c2338dae2c029c1459d21ab..092162e1fde420f63dd9f125b4aed492a10a7c41 100644
--- a/src/lib_protocol_compiler/final_protocol_versions
+++ b/src/lib_protocol_compiler/final_protocol_versions
@@ -19,4 +19,4 @@ PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW
 PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1
 PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf
 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH
-PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5
+PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc
diff --git a/src/proto_019_PtParisA/lib_benchmark/test/test_distribution.ml b/src/proto_019_PtParisA/lib_benchmark/test/test_distribution.ml
index bb41afdcec5b7833d2a1319af30cc54ff39f4d3d..c067d74dec094a38eb7b6393732c6ba2e74af4f0 100644
--- a/src/proto_019_PtParisA/lib_benchmark/test/test_distribution.ml
+++ b/src/proto_019_PtParisA/lib_benchmark/test/test_distribution.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 open Michelson_samplers
 open Protocol
 open Internal_for_tests
diff --git a/src/proto_019_PtParisA/lib_client/operation_result.ml b/src/proto_019_PtParisA/lib_client/operation_result.ml
index c93787aedcca2240db66cccdf1180841aec90d9a..811bdc1fc4f4766a0beab8535c53f71d5d397c9e 100644
--- a/src/proto_019_PtParisA/lib_client/operation_result.ml
+++ b/src/proto_019_PtParisA/lib_client/operation_result.ml
@@ -382,6 +382,8 @@ let pp_balance_updates ppf balance_updates =
   let pp_frozen_staker ppf (staker : Receipt.frozen_staker) =
     match staker with
     | Baker baker -> pp_baker ppf baker
+    | Baker_edge baker ->
+        Format.fprintf ppf "baker edge %a" Signature.Public_key_hash.pp baker
     | Single_staker {staker; delegate} ->
         Format.fprintf
           ppf
diff --git a/src/proto_019_PtParisA/lib_client_sapling/client_sapling_commands.mli b/src/proto_019_PtParisA/lib_client_sapling/client_sapling_commands.mli
index 913abf8596b1e251c009933c60a1f75541fbe416..ad7275224007c570551e5359d0512894b0117ab9 100644
--- a/src/proto_019_PtParisA/lib_client_sapling/client_sapling_commands.mli
+++ b/src/proto_019_PtParisA/lib_client_sapling/client_sapling_commands.mli
@@ -1,23 +1,8 @@
-(* The MIT License (MIT)
- *
- * Copyright (c) 2019-2020 Nomadic Labs 
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE. *)
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2019-2020 Nomadic Labs,           *)
+(*                                                                           *)
+(*****************************************************************************)
 
 val commands : unit -> Protocol_client_context.full Tezos_clic.command list
diff --git a/src/proto_019_PtParisA/lib_client_sapling/context.mli b/src/proto_019_PtParisA/lib_client_sapling/context.mli
index 5520393c140225cf961630032767ad84f83fc2d1..fdec0b0f8150c266aeaff5970cc19a4ef726d076 100644
--- a/src/proto_019_PtParisA/lib_client_sapling/context.mli
+++ b/src/proto_019_PtParisA/lib_client_sapling/context.mli
@@ -1,24 +1,9 @@
-(* The MIT License (MIT)
- *
- * Copyright (c) 2019-2020 Nomadic Labs 
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE. *)
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2019-2020 Nomadic Labs,           *)
+(*                                                                           *)
+(*****************************************************************************)
 
 (**
    This module allows the creation of Sapling transactions: shield, unshield and
diff --git a/src/proto_019_PtParisA/lib_client_sapling/wallet.mli b/src/proto_019_PtParisA/lib_client_sapling/wallet.mli
index 5e1238067f77d0e1aad674fec2ae8c5993152459..4fab3b06469ba65edf8ba40856a2a769d82c8e0f 100644
--- a/src/proto_019_PtParisA/lib_client_sapling/wallet.mli
+++ b/src/proto_019_PtParisA/lib_client_sapling/wallet.mli
@@ -1,24 +1,9 @@
-(* The MIT License (MIT)
- *
- * Copyright (c) 2019-2020 Nomadic Labs 
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE. *)
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2019-2020 Nomadic Labs,           *)
+(*                                                                           *)
+(*****************************************************************************)
 
 open Tezos_sapling.Core.Client
 
diff --git a/src/proto_019_PtParisA/lib_dal/dal_plugin_registration.ml b/src/proto_019_PtParisA/lib_dal/dal_plugin_registration.ml
index 47474797a02de8dcaa66e6ee1ad11deeba462ada..dd78057182c0a6e970005cba4bc20d06d65ab5a9 100644
--- a/src/proto_019_PtParisA/lib_dal/dal_plugin_registration.ml
+++ b/src/proto_019_PtParisA/lib_dal/dal_plugin_registration.ml
@@ -107,16 +107,9 @@ module Plugin = struct
     let+ pkh_to_shards =
       Plugin.RPC.Dal.dal_shards cpctxt (`Main, `Head 0) ~level ()
     in
-    let indexes (initial_slot, power) =
-      let last_slot = initial_slot + power - 1 in
-      let rec iter acc i =
-        if i < initial_slot then acc else iter (i :: acc) (i - 1)
-      in
-      iter [] last_slot
-    in
     List.fold_left
-      (fun acc (pkh, s) ->
-        Signature.Public_key_hash.Map.add pkh (indexes s) acc)
+      (fun acc ({delegate; indexes} : Plugin.RPC.Dal.S.shards_assignment) ->
+        Signature.Public_key_hash.Map.add delegate indexes acc)
       Signature.Public_key_hash.Map.empty
       pkh_to_shards
 
diff --git a/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_daemon.ml b/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_daemon.ml
index 2a6f3d8afc6b1250c84103b6c22f67481eec3341..86967abcaa36638808e12aecb4dba42638aa28f1 100644
--- a/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_daemon.ml
+++ b/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_daemon.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 module Baker = struct
   let run ~(cctxt : #Protocol_client_context.full) ~stop_on_event ~chain_id
       ~(context_index : Abstract_context_index.t) ~delegates =
diff --git a/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_services.ml b/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_services.ml
index b6d27e3d8dea35bdc79bcb6e4372825386105d48..95acc55de6297afc256d46093962be85868e0439 100644
--- a/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_services.ml
+++ b/src/proto_019_PtParisA/lib_delegate/test/mockup_simulator/faked_services.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 open Tezos_shell_services
 module Directory = Tezos_rpc.Directory
 module Chain_services = Tezos_shell_services.Chain_services
diff --git a/src/proto_019_PtParisA/lib_delegate/test/test_scenario.ml b/src/proto_019_PtParisA/lib_delegate/test/test_scenario.ml
index 094d4f7234659446288bad2caf8446401df4826d..56a6ee9e4369ff949d819fd6d889dc31471587a4 100644
--- a/src/proto_019_PtParisA/lib_delegate/test/test_scenario.ml
+++ b/src/proto_019_PtParisA/lib_delegate/test/test_scenario.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 (* Testing
    -------
    Component:    Protocol, delegate
diff --git a/src/proto_019_PtParisA/lib_parameters/default_parameters.ml b/src/proto_019_PtParisA/lib_parameters/default_parameters.ml
index ffb7b7a64980b4ea073f648613d81d5142676ab8..d2272713f3d6d00239f689110fce310e3f558748 100644
--- a/src/proto_019_PtParisA/lib_parameters/default_parameters.ml
+++ b/src/proto_019_PtParisA/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;
     }
 
@@ -332,12 +329,7 @@ let constants_sandbox =
           constants_mainnet.dal with
           number_of_slots = 16;
           cryptobox_parameters =
-            {
-              Dal.redundancy_factor = 16;
-              page_size = 4096;
-              number_of_shards = 2048;
-              slot_size = 1 lsl 16;
-            };
+            {default_cryptobox_parameters with number_of_shards = 256};
         };
     issuance_weights;
     blocks_preservation_cycles = 1;
@@ -359,7 +351,7 @@ let constants_sandbox =
   }
 
 let constants_test =
-  let consensus_committee_size = 25 in
+  let consensus_committee_size = 67 in
   let Constants.Generated.
         {max_slashing_threshold = _; consensus_threshold; issuance_weights} =
     Constants.Generated.generate ~consensus_committee_size
@@ -373,10 +365,9 @@ let constants_test =
           number_of_slots = 8;
           cryptobox_parameters =
             {
-              redundancy_factor = 16;
-              page_size = 4096;
-              number_of_shards = 2048;
-              slot_size = 1 lsl 16;
+              default_cryptobox_parameters with
+              redundancy_factor = 2;
+              number_of_shards = 64;
             };
         };
     issuance_weights;
diff --git a/src/proto_019_PtParisA/lib_plugin/RPC.ml b/src/proto_019_PtParisA/lib_plugin/RPC.ml
index 7ad39726a441ee4358e3282bf48916f2a13cf268..697dd03f0289ed37038beb8d05fcb833e473be4a 100644
--- a/src/proto_019_PtParisA/lib_plugin/RPC.ml
+++ b/src/proto_019_PtParisA/lib_plugin/RPC.ml
@@ -3126,21 +3126,42 @@ module Dal = struct
         ~query
         RPC_path.(path / "confirmed_slot_headers_history")
 
+    type shards_query = {
+      level : Raw_level.t option;
+      delegates : Signature.Public_key_hash.t list;
+    }
+
     let shards_query =
-      RPC_query.(
-        query (fun level -> level)
-        |+ opt_field "level" Raw_level.rpc_arg (fun t -> t)
-        |> seal)
+      let open RPC_query in
+      query (fun level delegates -> {level; delegates})
+      |+ opt_field "level" Raw_level.rpc_arg (fun t -> t.level)
+      |+ multi_field "delegates" Signature.Public_key_hash.rpc_arg (fun t ->
+             t.delegates)
+      |> seal
+
+    type shards_assignment = {
+      delegate : Signature.Public_key_hash.t;
+      indexes : int list;
+    }
+
+    let shards_assignment_encoding =
+      let open Data_encoding in
+      conv
+        (fun {delegate; indexes} -> (delegate, indexes))
+        (fun (delegate, indexes) -> {delegate; indexes})
+        (obj2
+           (req "delegate" Signature.Public_key_hash.encoding)
+           (req "indexes" (list int16)))
+
+    type shards_output = shards_assignment list
 
     let shards =
       RPC_service.get_service
         ~description:
-          "Get the shard assignements for a given level (the default is the \
-           current level)"
+          "Get the shards assignment for a given level (the default is the \
+           current level) and given delegates (the default is all delegates)"
         ~query:shards_query
-        ~output:
-          Data_encoding.(
-            list (tup2 Signature.Public_key_hash.encoding (tup2 int16 int16)))
+        ~output:(Data_encoding.list shards_assignment_encoding)
         RPC_path.(path / "shards")
   end
 
@@ -3158,13 +3179,31 @@ module Dal = struct
   let dal_confirmed_slots_history ctxt block =
     RPC_context.make_call0 S.dal_confirmed_slot_headers_history ctxt block () ()
 
-  let dal_shards ctxt block ?level () =
-    RPC_context.make_call0 S.shards ctxt block level ()
+  let dal_shards ctxt block ?level ?(delegates = []) () =
+    RPC_context.make_call0 S.shards ctxt block {level; delegates} ()
 
   let register_shards () =
-    Registration.register0 ~chunked:true S.shards @@ fun ctxt level () ->
-    let level = Option.value level ~default:(Level.current ctxt).level in
-    Dal_services.shards ctxt ~level
+    Registration.register0 ~chunked:true S.shards @@ fun ctxt q () ->
+    let open Lwt_result_syntax in
+    let*? level_opt =
+      Option.map_e (Level.from_raw_with_offset ctxt ~offset:0l) q.level
+    in
+    let level = Option.value level_opt ~default:(Level.current ctxt) in
+    let* _ctxt, map = Dal_services.shards ctxt ~level in
+    let query_delegates = Signature.Public_key_hash.Set.of_list q.delegates in
+    let all_delegates =
+      Signature.Public_key_hash.Set.is_empty query_delegates
+    in
+    Signature.Public_key_hash.Map.fold
+      (fun delegate indexes acc ->
+        if
+          all_delegates
+          || Signature.Public_key_hash.Set.mem delegate query_delegates
+        then ({delegate; indexes} : S.shards_assignment) :: acc
+        else acc)
+      map
+      []
+    |> return
 
   let register () =
     register_dal_confirmed_slot_headers_history () ;
@@ -3883,7 +3922,8 @@ module Attestation_rights = struct
                  consensus_pk = _;
                  consensus_pkh = consensus_key;
                },
-               attestation_power )
+               attestation_power,
+               _dal_power )
              acc ->
           {delegate; consensus_key; first_slot; attestation_power} :: acc)
         rights
diff --git a/src/proto_019_PtParisA/lib_protocol/TEZOS_PROTOCOL b/src/proto_019_PtParisA/lib_protocol/TEZOS_PROTOCOL
index dee721642fdfe88a80e72715311708de852804d9..3f77ad23fa4bef3c407e2c2a53d47d3233ea970f 100644
--- a/src/proto_019_PtParisA/lib_protocol/TEZOS_PROTOCOL
+++ b/src/proto_019_PtParisA/lib_protocol/TEZOS_PROTOCOL
@@ -1,6 +1,6 @@
 {
     "expected_env_version": 12,
-    "hash": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+    "hash": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
     "modules": [
         "Misc",
         "Non_empty_string",
diff --git a/src/proto_019_PtParisA/lib_protocol/adaptive_issuance_services.ml b/src/proto_019_PtParisA/lib_protocol/adaptive_issuance_services.ml
index 36885d778f81ff68882a743d5b66b408013df72f..2907d0a2434f8ae87b50db50a1445153a95f1618 100644
--- a/src/proto_019_PtParisA/lib_protocol/adaptive_issuance_services.ml
+++ b/src/proto_019_PtParisA/lib_protocol/adaptive_issuance_services.ml
@@ -148,7 +148,7 @@ module S = struct
     RPC_service.get_service
       ~description:
         "Returns the expected issued tez for the provided block and the next \
-         five cycles"
+         'consensus_rights_delay' cycles"
       ~query:RPC_query.empty
       ~output:(Data_encoding.list expected_rewards_encoding)
       RPC_path.(path / "expected_issuance")
diff --git a/src/proto_019_PtParisA/lib_protocol/alpha_context.ml b/src/proto_019_PtParisA/lib_protocol/alpha_context.ml
index f60dd9f9987f65093a8d2f5628ce3272cb35b64d..6e5b48cc2a7e0f5c9ea01458f0ab470007cd5b0c 100644
--- a/src/proto_019_PtParisA/lib_protocol/alpha_context.ml
+++ b/src/proto_019_PtParisA/lib_protocol/alpha_context.ml
@@ -525,9 +525,12 @@ module Receipt = struct
         delegate : Signature.public_key_hash;
       }
     | Shared_between_stakers of {delegate : Signature.public_key_hash}
+    | Baker_edge of Signature.public_key_hash
 
   let frozen_baker = Frozen_staker_repr.baker
 
+  let frozen_baker_edge = Frozen_staker_repr.baker_edge
+
   let frozen_single_staker = Frozen_staker_repr.single_staker
 
   let frozen_shared_between_stakers = Frozen_staker_repr.shared_between_stakers
diff --git a/src/proto_019_PtParisA/lib_protocol/alpha_context.mli b/src/proto_019_PtParisA/lib_protocol/alpha_context.mli
index bd74853aa9244e1da9a20708b42ef1364ae4f758..e6ecfa1eec42368269e5e0f417dc09f8c33cecc7 100644
--- a/src/proto_019_PtParisA/lib_protocol/alpha_context.mli
+++ b/src/proto_019_PtParisA/lib_protocol/alpha_context.mli
@@ -80,6 +80,8 @@ module Slot : sig
 
   val succ : t -> t tzresult
 
+  val to_int : t -> int
+
   val of_int_do_not_use_except_for_parameters : int -> t
 
   val encoding : t Data_encoding.encoding
@@ -2118,9 +2120,12 @@ module Receipt : sig
         delegate : Signature.public_key_hash;
       }
     | Shared_between_stakers of {delegate : Signature.public_key_hash}
+    | Baker_edge of Signature.public_key_hash
 
   val frozen_baker : Signature.public_key_hash -> frozen_staker
 
+  val frozen_baker_edge : Signature.public_key_hash -> frozen_staker
+
   val frozen_single_staker :
     staker:Contract.t -> delegate:Signature.public_key_hash -> frozen_staker
 
@@ -2495,7 +2500,7 @@ module Delegate : sig
     val staking_balance : context -> public_key_hash -> Tez.t tzresult Lwt.t
 
     val min_delegated_in_current_cycle :
-      context -> public_key_hash -> Tez.t tzresult Lwt.t
+      context -> public_key_hash -> (Tez.t * Level_repr.t option) tzresult Lwt.t
 
     val has_pending_denunciations : context -> public_key_hash -> bool Lwt.t
 
@@ -2730,6 +2735,8 @@ module Dal : sig
 
   val number_of_slots : context -> int
 
+  val number_of_shards : context -> int
+
   (** This module re-exports definitions from {!Dal_slot_index_repr}. *)
   module Slot_index : sig
     type t
@@ -2782,22 +2789,7 @@ module Dal : sig
 
     val expected_size_in_bits : max_index:Slot_index.t -> int
 
-    val shards_of_attester :
-      context -> attester:public_key_hash -> shard_index list option
-
-    val record_attested_shards : context -> t -> int list -> context
-
-    type committee = {
-      pkh_to_shards : (shard_index * int) Signature.Public_key_hash.Map.t;
-      shard_to_pkh : Signature.Public_key_hash.t Shard_map.t;
-    }
-
-    val compute_committee :
-      context ->
-      (Slot.t -> (context * Signature.Public_key_hash.t) tzresult Lwt.t) ->
-      committee tzresult Lwt.t
-
-    val init_committee : context -> committee -> context
+    val record_number_of_attested_shards : context -> t -> int -> context
   end
 
   type slot_id = {published_level : Raw_level.t; index : Slot_index.t}
@@ -2881,6 +2873,11 @@ module Dal : sig
 
     val finalize_pending_slot_headers :
       context -> number_of_slots:int -> (context * Attestation.t) tzresult Lwt.t
+
+    val compute_attested_slot_headers :
+      is_slot_attested:(Header.t -> bool) ->
+      Header.t list ->
+      Header.t list * Attestation.t
   end
 
   module Operations : sig
@@ -2969,6 +2966,7 @@ module Dal_errors : sig
     | Dal_data_availibility_attester_not_in_committee of {
         attester : Signature.Public_key_hash.t;
         level : Raw_level.t;
+        slot : Slot.t;
       }
     | Dal_cryptobox_error of {explanation : string}
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/apply.ml b/src/proto_019_PtParisA/lib_protocol/apply.ml
index 414ca479208a3ec919c0aaadfb94e0c7a7ab2044..461cc5673b60936d18b0aaa3c3f79d07e8025719 100644
--- a/src/proto_019_PtParisA/lib_protocol/apply.ml
+++ b/src/proto_019_PtParisA/lib_protocol/apply.ml
@@ -2237,7 +2237,8 @@ let find_in_slot_map slot slot_map =
       | None ->
           (* This should not happen: operation validation should have failed. *)
           tzfail Faulty_validation_wrong_slot
-      | Some (consensus_key, power) -> return (consensus_key, power))
+      | Some (consensus_key, power, dal_power) ->
+          return (consensus_key, power, dal_power))
 
 let record_preattestation ctxt (mode : mode) (content : consensus_content) :
     (context * Kind.preattestation contents_result_list) tzresult Lwt.t =
@@ -2263,7 +2264,7 @@ let record_preattestation ctxt (mode : mode) (content : consensus_content) :
   in
   match mode with
   | Application _ | Full_construction _ ->
-      let*? consensus_key, power =
+      let*? consensus_key, power, _dal_power =
         find_in_slot_map content.slot (Consensus.allowed_preattestations ctxt)
       in
       let*? ctxt =
@@ -2305,7 +2306,7 @@ let record_attestation ctxt (mode : mode) (consensus : consensus_content)
   in
   match mode with
   | Application _ | Full_construction _ ->
-      let*? consensus_key, power =
+      let*? consensus_key, power, dal_power =
         find_in_slot_map consensus.slot (Consensus.allowed_attestations ctxt)
       in
       let*? ctxt =
@@ -2315,11 +2316,7 @@ let record_attestation ctxt (mode : mode) (consensus : consensus_content)
         Option.fold
           ~none:(Result_syntax.return ctxt)
           ~some:(fun dal ->
-            Dal_apply.apply_attestation
-              ctxt
-              consensus_key
-              consensus.level
-              dal.attestation)
+            Dal_apply.apply_attestation ctxt dal.attestation ~power:dal_power)
           dal
       in
       return (ctxt, mk_attestation_result consensus_key power)
@@ -2788,7 +2785,9 @@ let record_attesting_participation ctxt =
   | None -> tzfail (Consensus.Slot_map_not_found {loc = __LOC__})
   | Some validators ->
       Slot.Map.fold_es
-        (fun initial_slot ((consensus_pk : Consensus_key.pk), power) ctxt ->
+        (fun initial_slot
+             ((consensus_pk : Consensus_key.pk), power, _dal_power)
+             ctxt ->
           let participation =
             if Slot.Set.mem initial_slot (Consensus.attestations_seen ctxt) then
               Delegate.Participated
diff --git a/src/proto_019_PtParisA/lib_protocol/baking.ml b/src/proto_019_PtParisA/lib_protocol/baking.ml
index 2bff27b7289e83843dc8328b7a459cffc0fd56b5..7cc21c60edc0083babdcb119e14b19cb7554d235 100644
--- a/src/proto_019_PtParisA/lib_protocol/baking.ml
+++ b/src/proto_019_PtParisA/lib_protocol/baking.ml
@@ -110,6 +110,7 @@ let attesting_rights_by_first_slot ctxt level =
   let*? slots =
     Slot.Range.create ~min:0 ~count:(Constants.consensus_committee_size ctxt)
   in
+  let number_of_shards = Dal.number_of_shards ctxt in
   let* ctxt, (_, slots_map) =
     Slot.Range.fold_es
       (fun (ctxt, (delegates_map, slots_map)) slot ->
@@ -132,12 +133,16 @@ let attesting_rights_by_first_slot ctxt level =
         in
         (* [slots_map]'keys are the minimal slots of delegates because
            we fold on slots in increasing order *)
+        let in_dal_committee =
+          if Compare.Int.(Slot.to_int slot < number_of_shards) then 1 else 0
+        in
         let slots_map =
           Slot.Map.update
             initial_slot
             (function
-              | None -> Some (consensus_pk, 1)
-              | Some (consensus_pk, count) -> Some (consensus_pk, count + 1))
+              | None -> Some (consensus_pk, 1, in_dal_committee)
+              | Some (consensus_pk, count, dal_count) ->
+                  Some (consensus_pk, count + 1, dal_count + in_dal_committee))
             slots_map
         in
         (ctxt, (delegates_map, slots_map)))
diff --git a/src/proto_019_PtParisA/lib_protocol/baking.mli b/src/proto_019_PtParisA/lib_protocol/baking.mli
index d99e7b9dab7b4a5d89f1574b90ca5bf3e5a6b301..0aeabf4f5731ba478fe17c2641597f85881caacf 100644
--- a/src/proto_019_PtParisA/lib_protocol/baking.mli
+++ b/src/proto_019_PtParisA/lib_protocol/baking.mli
@@ -53,12 +53,12 @@ val attesting_rights :
 
 (** Computes attesting rights for a given level.
 
-   @return  map from allocated first slots to their owner's public key, public key
-   hash, and attesting power. *)
+   @return map from allocated first slots to their owner's public key, consensus
+     attesting power, and DAL attesting power. *)
 val attesting_rights_by_first_slot :
   context ->
   Level.t ->
-  (context * (Consensus_key.pk * int) Slot.Map.t) tzresult Lwt.t
+  (context * (Consensus_key.pk * int * int) Slot.Map.t) tzresult Lwt.t
 
 (** Computes the bonus baking reward depending on the attestation power. *)
 val bonus_baking_reward : context -> attestation_power:int -> Tez.t tzresult
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_apply.ml b/src/proto_019_PtParisA/lib_protocol/dal_apply.ml
index de04ea637bc2c475a68e1bd3643b7cce97c70d6d..c3c5b1aa16fc7e41175c7ae1d0c78142caf6a3e4 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_apply.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_apply.ml
@@ -53,7 +53,7 @@ let slot_of_int_e ~number_of_slots n =
 let pkh_of_consensus_key (consensus_key : Consensus_key.pk) =
   consensus_key.delegate
 
-let validate_block_attestation ctxt level consensus_key attestation =
+let validate_attestation ctxt level slot consensus_key attestation =
   let open Lwt_result_syntax in
   let*? () = assert_dal_feature_enabled ctxt in
   let number_of_slots = Dal.number_of_slots ctxt in
@@ -65,32 +65,17 @@ let validate_block_attestation ctxt level consensus_key attestation =
       Compare.Int.(size <= maximum_size)
       (Dal_attestation_size_limit_exceeded {maximum_size; got = size})
   in
-  let attester = pkh_of_consensus_key consensus_key in
+  let number_of_shards = Dal.number_of_shards ctxt in
   fail_when
-    (Option.is_none @@ Dal.Attestation.shards_of_attester ctxt ~attester)
-    (Dal_data_availibility_attester_not_in_committee {attester; level})
+    Compare.Int.(Slot.to_int slot >= number_of_shards)
+    (let attester = pkh_of_consensus_key consensus_key in
+     Dal_data_availibility_attester_not_in_committee {attester; level; slot})
 
-let validate_mempool_attestation ctxt attestation =
-  let open Lwt_result_syntax in
-  let*? () = assert_dal_feature_enabled ctxt in
-  let number_of_slots = Dal.number_of_slots ctxt in
-  let*? max_index = number_of_slots - 1 |> slot_of_int_e ~number_of_slots in
-  let maximum_size = Dal.Attestation.expected_size_in_bits ~max_index in
-  let size = Dal.Attestation.occupied_size_in_bits attestation in
-  fail_unless
-    Compare.Int.(size <= maximum_size)
-    (Dal_attestation_size_limit_exceeded {maximum_size; got = size})
-
-let apply_attestation ctxt consensus_key level attestation =
+let apply_attestation ctxt attestation ~power =
   let open Result_syntax in
   let* () = assert_dal_feature_enabled ctxt in
-  let attester = pkh_of_consensus_key consensus_key in
-  match Dal.Attestation.shards_of_attester ctxt ~attester with
-  | None ->
-      (* This should not happen: operation validation should have failed. *)
-      error (Dal_data_availibility_attester_not_in_committee {attester; level})
-  | Some shards ->
-      return (Dal.Attestation.record_attested_shards ctxt attestation shards)
+  return
+    (Dal.Attestation.record_number_of_attested_shards ctxt attestation power)
 
 (* This function should fail if we don't want the operation to be
    propagated over the L1 gossip network. Because this is a manager
@@ -145,23 +130,3 @@ let finalisation ctxt =
         Dal.Slot.finalize_pending_slot_headers ctxt ~number_of_slots
       in
       (ctxt, attestation))
-
-let compute_committee ctxt level =
-  let open Lwt_result_syntax in
-  let*? () = assert_dal_feature_enabled ctxt in
-  let pkh_from_tenderbake_slot slot =
-    let+ ctxt, consensus_key = Stake_distribution.slot_owner ctxt level slot in
-    (ctxt, pkh_of_consensus_key consensus_key)
-  in
-  (* This committee is cached because it is the one we will use
-     for the validation of the DAL attestations. *)
-  Alpha_context.Dal.Attestation.compute_committee ctxt pkh_from_tenderbake_slot
-
-let initialisation ctxt ~level =
-  let open Lwt_result_syntax in
-  only_if_dal_feature_enabled
-    ctxt
-    ~default:(fun ctxt -> return ctxt)
-    (fun ctxt ->
-      let+ committee = compute_committee ctxt level in
-      Alpha_context.Dal.Attestation.init_committee ctxt committee)
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_apply.mli b/src/proto_019_PtParisA/lib_protocol/dal_apply.mli
index b7da86a8bb472469412212b6ffe8d61162ee2723..55bd78051f1a89805bdb6188d641cdd75e68b9a1 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_apply.mli
+++ b/src/proto_019_PtParisA/lib_protocol/dal_apply.mli
@@ -28,37 +28,27 @@
 
 open Alpha_context
 
-(** [validate_block_attestation ctxt level consensus_key attestation] checks
+(** [validate_attestation ctxt level slot consensus_key attestation] checks
     whether the DAL attestation [attestation] emitted at given [level] by the
-    attester with the given [consensus_key] is valid for block inclusion. If an
+    attester with the given [consensus_key] and given [slot] is valid. If an
     [Error _] is returned, the [op] is not valid. The checks made are:
     * the attestation size does not exceed the maximum;
     * the delegate is in the DAL committee.
 
     These are checks done for the DAL part alone, checks on other fields of an
-    attestation (like level, round, slot) are done by the caller. *)
-val validate_block_attestation :
+    attestation (like level, round) are done by the caller. *)
+val validate_attestation :
   t ->
   Raw_level.t ->
+  Slot.t ->
   Consensus_key.pk ->
   Dal.Attestation.t ->
   unit tzresult Lwt.t
 
-(** [validate_mempool_attestation ctxt level consensus_key attestation] checks
-    whether the DAL attestation [attestation] is valid for the mempool. It is
-    similar to [check_block_attestion], but it performs only the check on the
-    size, as [consensus_key] is not available. If an [Error _] is returned, the
-    [op] is not valid.
-
-    These are checks done for the DAL part alone, checks on other fields of an
-    attestation (like level, round, slot) are done by the caller. *)
-val validate_mempool_attestation : t -> Dal.Attestation.t -> unit tzresult Lwt.t
-
-(** [apply_attestation ctxt consensus_key level attestation] applies
-    [attestation] into the [ctxt] assuming [consensus_key.delegate] issued those
-    attestations at level [level]. *)
-val apply_attestation :
-  t -> Consensus_key.pk -> Raw_level.t -> Dal.Attestation.t -> t tzresult
+(** [apply_attestation ctxt attestation] records in the context that the given
+    [attestation] was issued and the corresponding attester has the given
+    [power]. *)
+val apply_attestation : t -> Dal.Attestation.t -> power:int -> t tzresult
 
 (** [validate_publish_commitment ctxt slot] ensures that [slot_header] is
    valid and prevents an operation containing [slot_header] to be
@@ -80,12 +70,3 @@ val apply_publish_commitment :
    [lag] is a parametric constant specific to the data-availability
    layer.  *)
 val finalisation : t -> (t * Dal.Attestation.t) tzresult Lwt.t
-
-(** [initialize ctxt ~level] should be executed at block
-   initialisation time. It allows to cache the committee for [level]
-   in memory so that every time we need to use this committee, there
-   is no need to recompute it again. *)
-val initialisation : t -> level:Level.t -> t tzresult Lwt.t
-
-(** [compute_committee ctxt level] computes the DAL committee for [level]. *)
-val compute_committee : t -> Level.t -> Dal.Attestation.committee tzresult Lwt.t
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.ml b/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.ml
index 2fc9e154e15b5e03ad293c0b135372d2dead4e08..920e04d7da5c538073280427030a9d51c463aee4 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.ml
@@ -91,55 +91,51 @@ end)
 module Accountability = struct
   type attested_slots = t
 
-  (* DAL/FIXME https://gitlab.com/tezos/tezos/-/issues/3109
-
-     Think hard about this data structure and whether it needs to be
-     optimized.
-  *)
-
-  (* A list of set of shard indexes (a set of shards per slot) *)
-  type t = Bitset.t list
-
-  let init ~length =
-    let l =
-      List.init
-        ~when_negative_length:
-          "Dal_attestation_repr.Accountability.init: length cannot be negative"
-        length
-        (fun _ -> Bitset.empty)
+  module SlotMap = Map.Make (Compare.Int)
+
+  type t = {number_of_attested_shards : int SlotMap.t; number_of_slots : int}
+
+  let init ~number_of_slots =
+    {number_of_attested_shards = SlotMap.empty; number_of_slots}
+
+  (* This function must be called at most once for a given attester; otherwise
+     the count will be flawed. *)
+  let record_number_of_attested_shards t baker_attested_slots
+      number_of_baker_shards =
+    let rec iter slot_index map =
+      if Compare.Int.(slot_index >= t.number_of_slots) then map
+      else
+        let map =
+          match Bitset.mem baker_attested_slots slot_index with
+          | Error _ ->
+              (* impossible, as [slot_index] is non-negative *)
+              map
+          | Ok true ->
+              (* slot is attested by baker *)
+              SlotMap.update
+                slot_index
+                (function
+                  | None -> Some number_of_baker_shards
+                  | Some old_number_of_attested_shards ->
+                      Some
+                        (old_number_of_attested_shards + number_of_baker_shards))
+                map
+          | Ok false ->
+              (* slot is not attested by baker, nothing to update *)
+              map
+        in
+        iter (slot_index + 1) map
     in
-    match l with Error msg -> invalid_arg msg | Ok l -> l
-
-  let record_slot_shard_availability bitset shards =
-    List.fold_left
-      (fun bitset shard ->
-        Bitset.add bitset shard |> Result.value ~default:bitset)
-      bitset
-      shards
-
-  let record_attested_shards shard_bitset_per_slot attested_slots shards =
-    List.mapi
-      (fun slot bitset ->
-        match Bitset.mem attested_slots slot with
-        | Error _ ->
-            (* slot index is above the length provided at initialisation *)
-            bitset
-        | Ok slot_attested ->
-            if slot_attested then record_slot_shard_availability bitset shards
-            else bitset)
-      shard_bitset_per_slot
-
-  let is_slot_attested shard_bitset_per_slot ~threshold ~number_of_shards index
-      =
-    match List.nth shard_bitset_per_slot (Dal_slot_index_repr.to_int index) with
-    | None -> false
-    | Some bitset ->
-        let acc = ref 0 in
-        List.iter
-          (fun x ->
-            match Bitset.mem bitset x with
-            | Error _ | Ok false -> ()
-            | Ok true -> incr acc)
-          Misc.(0 --> (number_of_shards - 1)) ;
-        Compare.Int.(!acc >= threshold * number_of_shards / 100)
+    let number_of_attested_shards = iter 0 t.number_of_attested_shards in
+    {t with number_of_attested_shards}
+
+  let is_slot_attested t ~threshold ~number_of_shards slot_index =
+    let index = Dal_slot_index_repr.to_int slot_index in
+    let number_of_attested_shards =
+      match SlotMap.find index t.number_of_attested_shards with
+      | None -> 0
+      | Some v -> v
+    in
+    Compare.Int.(
+      number_of_attested_shards >= threshold * number_of_shards / 100)
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.mli b/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.mli
index 20f45a10a1f666dd946ec200b28787282cb089f1..a9edc93ac34c401191bc219e44ccc5fc49ef9290 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/dal_attestation_repr.mli
@@ -97,24 +97,23 @@ module Accountability : sig
      Consider using the [Bounded] module. In particular, change the
      semantics of [is_slot_attested] accordingly. *)
 
-  (** [init ~length] initialises a new accountability data-structure
-     with at most [length] slots and where for every slot, no shard is
+  (** [init ~number_of_slots] initialises a new accountability data-structure
+     with [number_of_slots] slots and where for every slot, no shard is
      available. *)
-  val init : length:int -> t
-
-  (** [record_attested_shards t slots shards] records that for all
-     slots declared available in [slots], the shard indices in [shards]
-     are deemed available. It is the responsibility of the caller to ensure
-     the shard indices are positive numbers. A negative shard index is
-     ignored. *)
-  val record_attested_shards : t -> attested_slots -> shard_index list -> t
-
-  (** [is_slot_attested t ~threshold ~number_of_shards slot] returns
-     [true] if the number of shards recorded in [t] for the [slot] is
-     above the [threshold] with respect to the total number of shards
-     specified by [number_of_shards]. Returns [false] otherwise or if
-     the [index] is out of the interval [0;length] where [length] is
-     the value provided to the [init] function. *)
+  val init : number_of_slots:int -> t
+
+  (** [record_number_of_attested_shards t slots number] records that, for all
+      slots declared available in [slots], the given [number] of shard indices
+      are deemed available. This function must be called at most once for a
+      given attester; otherwise the count will be flawed. *)
+  val record_number_of_attested_shards : t -> attested_slots -> int -> t
+
+  (** [is_slot_attested t ~threshold ~number_of_shards slot] returns [true] if
+      the number of shards recorded in [t] for the [slot] is above the
+      [threshold] with respect to the total number of shards specified by
+      [number_of_shards]. Returns [false] otherwise or if the [index] is out of
+      the interval [0; number_of_slots - 1] where [number_of_slots] is the value
+      provided to the [init] function. *)
   val is_slot_attested :
     t -> threshold:int -> number_of_shards:int -> Dal_slot_index_repr.t -> bool
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_errors_repr.ml b/src/proto_019_PtParisA/lib_protocol/dal_errors_repr.ml
index dd62bf25d8e7143b68583ed3338a4ff68fdf27c2..585b9b6f78ccec0e2961c1be9291fe281925944f 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_errors_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_errors_repr.ml
@@ -42,6 +42,7 @@ type error +=
   | Dal_data_availibility_attester_not_in_committee of {
       attester : Signature.Public_key_hash.t;
       level : Raw_level_repr.t;
+      slot : Slot_repr.t;
     }
   | Dal_cryptobox_error of {explanation : string}
   | Dal_register_invalid_slot_header of {
@@ -186,24 +187,29 @@ let () =
     ~id:"Dal_data_availibility_attester_not_in_committee"
     ~title:"The attester is not part of the DAL committee for this level"
     ~description:"The attester is not part of the DAL committee for this level"
-    ~pp:(fun ppf (attester, level) ->
+    ~pp:(fun ppf (attester, level, slot) ->
       Format.fprintf
         ppf
-        "The attester %a is not part of the DAL committee for the level %a"
+        "The attester %a, with slot %a, is not part of the DAL committee for \
+         the level %a."
         Signature.Public_key_hash.pp
         attester
+        Slot_repr.pp
+        slot
         Raw_level_repr.pp
         level)
     Data_encoding.(
-      obj2
+      obj3
         (req "attester" Signature.Public_key_hash.encoding)
-        (req "level" Raw_level_repr.encoding))
+        (req "level" Raw_level_repr.encoding)
+        (req "slot" Slot_repr.encoding))
     (function
-      | Dal_data_availibility_attester_not_in_committee {attester; level} ->
-          Some (attester, level)
+      | Dal_data_availibility_attester_not_in_committee {attester; level; slot}
+        ->
+          Some (attester, level, slot)
       | _ -> None)
-    (fun (attester, level) ->
-      Dal_data_availibility_attester_not_in_committee {attester; level}) ;
+    (fun (attester, level, slot) ->
+      Dal_data_availibility_attester_not_in_committee {attester; level; slot}) ;
   register_error_kind
     `Permanent
     ~id:"dal_cryptobox_error"
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_services.ml b/src/proto_019_PtParisA/lib_protocol/dal_services.ml
index 038e980885f4076fa9f58d2faa7b84b3f6c48e0b..1668c2f1b40a281290d7e9c0656ab24653d279ed 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_services.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_services.ml
@@ -32,12 +32,23 @@ let assert_dal_feature_enabled ctxt =
     Compare.Bool.(feature_enable = true)
     Dal_errors.Dal_feature_disabled
 
+(* Slots returned by this function are assumed by consumers to be in increasing
+   order, hence the use of [Slot.Range.rev_fold_es]. *)
 let shards ctxt ~level =
   let open Lwt_result_syntax in
-  let open Dal.Attestation in
   let*? () = assert_dal_feature_enabled ctxt in
-  let level = Level.from_raw ctxt level in
-  (* We do not cache this committee. This function being used by RPCs
-     to know the DAL committee at some particular level. *)
-  let+ committee = Dal_apply.compute_committee ctxt level in
-  Signature.Public_key_hash.Map.bindings committee.pkh_to_shards
+  let number_of_shards = Dal.number_of_shards ctxt in
+  let*? slots = Slot.Range.create ~min:0 ~count:number_of_shards in
+  Slot.Range.rev_fold_es
+    (fun (ctxt, map) slot ->
+      let* ctxt, consensus_pk = Stake_distribution.slot_owner ctxt level slot in
+      let slot = Slot.to_int slot in
+      let map =
+        Signature.Public_key_hash.Map.update
+          consensus_pk.delegate
+          (function None -> Some [slot] | Some slots -> Some (slot :: slots))
+          map
+      in
+      return (ctxt, map))
+    (ctxt, Signature.Public_key_hash.Map.empty)
+    slots
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_services.mli b/src/proto_019_PtParisA/lib_protocol/dal_services.mli
index d6394f128decf75158f7871bf0b034b09ea36af6..25d8803106af2fb56b104a6714176dd3797cad5f 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_services.mli
+++ b/src/proto_019_PtParisA/lib_protocol/dal_services.mli
@@ -23,11 +23,10 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(** [shards ctxt ~level] returns the DAL committee as an association
-   list that associates to the public key hash [pkh] of the member of
-   the committee an interval [(s,n)], meaning that the slots
-   [s;s+1;...;s+n-1] belongs to [pkh]. It is guaranteed that [n>0]. *)
+(** [shards ctxt ~level] returns the DAL committee as a mapping from the public
+    key hash of members of the committee to the list of shard indexes associated
+    to that member. *)
 val shards :
   Alpha_context.t ->
-  level:Alpha_context.Raw_level.t ->
-  (Signature.Public_key_hash.t * (int * int)) list tzresult Lwt.t
+  level:Alpha_context.Level.t ->
+  (Alpha_context.t * int list Signature.Public_key_hash.Map.t) tzresult Lwt.t
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_slot_repr.ml b/src/proto_019_PtParisA/lib_protocol/dal_slot_repr.ml
index a5d848ae8392e39f984f5368f22742f264be7de7..c1d216aee8850cbeace00167e4d7ac2354be263d 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_slot_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_slot_repr.ml
@@ -526,19 +526,20 @@ module History = struct
       let Header.{published_level; _} =
         Skip_list.content t |> Content.content_id
       in
-      if Raw_level_repr.equal published_level genesis_level then
-        (* If this is the first real cell of DAL, replace dummy genesis. *)
-        return (Skip_list.genesis next_cell_content, cache)
-      else
-        let* cache = History_cache.remember prev_cell_ptr t cache in
-        let* new_head =
+      let* new_head =
+        if Raw_level_repr.equal published_level genesis_level then
+          (* If this is the first real cell of DAL, replace dummy genesis. *)
+          return (Skip_list.genesis next_cell_content)
+        else
           Skip_list.next
             ~prev_cell:t
             ~prev_cell_ptr
             next_cell_content
             ~number_of_slots
-        in
-        return (new_head, cache)
+      in
+      let new_head_hash = hash new_head in
+      let* cache = History_cache.remember new_head_hash new_head cache in
+      return (new_head, cache)
 
     (* Given a list [attested_slot_headers] of well-ordered (wrt slots indices)
        (attested) slot headers, this function builds an extension [l] of
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.ml b/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.ml
index 699577121df3eec2ee83ea3d7c3538e6e9dbe9dd..944056b4f2b322c01835e09760c39f55bce109ae 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.ml
@@ -26,24 +26,26 @@
 let find_slot_headers ctxt level = Storage.Dal.Slot.Headers.find ctxt level
 
 let finalize_current_slot_headers ctxt =
-  let current_level = Raw_context.current_level ctxt in
-  let slot_headers = Raw_context.Dal.candidates ctxt in
-  match slot_headers with
-  | [] -> Lwt.return ctxt
-  | _ :: _ -> Storage.Dal.Slot.Headers.add ctxt current_level.level slot_headers
+  Storage.Dal.Slot.Headers.add
+    ctxt
+    (Raw_context.current_level ctxt).level
+    (Raw_context.Dal.candidates ctxt)
 
-let compute_attested_slot_headers ctxt seen_slot_headers =
+let compute_attested_slot_headers ~is_slot_attested seen_slot_headers =
   let open Dal_slot_repr in
   let fold_attested_slots (rev_attested_slot_headers, attestation) slot =
-    if Raw_context.Dal.is_slot_index_attested ctxt slot.Header.id.index then
+    if is_slot_attested slot then
       ( slot :: rev_attested_slot_headers,
         Dal_attestation_repr.commit attestation slot.Header.id.index )
     else (rev_attested_slot_headers, attestation)
   in
-  List.fold_left
-    fold_attested_slots
-    ([], Dal_attestation_repr.empty)
-    seen_slot_headers
+  let rev_attested_slot_headers, bitset =
+    List.fold_left
+      fold_attested_slots
+      ([], Dal_attestation_repr.empty)
+      seen_slot_headers
+  in
+  (List.rev rev_attested_slot_headers, bitset)
 
 let get_slot_headers_history ctxt =
   let open Lwt_result_syntax in
@@ -79,10 +81,14 @@ let finalize_pending_slot_headers ctxt ~number_of_slots =
         match seen_slots with
         | None -> return (ctxt, Dal_attestation_repr.empty, [])
         | Some seen_slots ->
-            let rev_attested_slot_headers, attestation =
-              compute_attested_slot_headers ctxt seen_slots
+            let attested_slot_headers, attestation =
+              let is_slot_attested slot =
+                Raw_context.Dal.is_slot_index_attested
+                  ctxt
+                  slot.Dal_slot_repr.Header.id.index
+              in
+              compute_attested_slot_headers ~is_slot_attested seen_slots
             in
-            let attested_slot_headers = List.rev rev_attested_slot_headers in
             return (ctxt, attestation, attested_slot_headers)
       in
       let* ctxt =
diff --git a/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.mli b/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.mli
index eafa34e3cc615acf520047f69ad8046b26073cf7..4dc2d270fca377d7bb566d726e436d56f39636cb 100644
--- a/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.mli
+++ b/src/proto_019_PtParisA/lib_protocol/dal_slot_storage.mli
@@ -72,3 +72,11 @@ val finalize_pending_slot_headers :
    in [ctxt], or Slots_history.genesis if no value is stored yet. *)
 val get_slot_headers_history :
   Raw_context.t -> Dal_slot_repr.History.t tzresult Lwt.t
+
+(** [compute_attested_slot_headers ~is_slot_attested published_slot_headers]
+    filter the given [published_slot_headers] and return the list of attested
+    slot headers and the corresponding bitset. *)
+val compute_attested_slot_headers :
+  is_slot_attested:(Dal_slot_repr.Header.t -> bool) ->
+  Dal_slot_repr.Header.t list ->
+  Dal_slot_repr.Header.t list * Dal_attestation_repr.t
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_services.ml b/src/proto_019_PtParisA/lib_protocol/delegate_services.ml
index b8e5ac3a68c52faa0e64481a5d412251c261914c..e48962d5b71811ad0958ce78eaebc761e07388c9 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_services.ml
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_services.ml
@@ -108,6 +108,13 @@ let consensus_key_info_encoding =
                 consensus_key_encoding))
           []))
 
+let min_delegated_in_current_cycle_encoding =
+  let open Data_encoding in
+  conv
+    (fun (min_delegated, anchor) -> (min_delegated, anchor))
+    (fun (min_delegated, anchor) -> (min_delegated, anchor))
+    (obj2 (req "amount" Tez.encoding) (opt "level" Level_repr.encoding))
+
 type info = {
   full_balance : Tez.t;
   current_frozen_deposits : Tez.t;
@@ -116,7 +123,7 @@ type info = {
   frozen_deposits_limit : Tez.t option;
   delegated_contracts : Contract.t list;
   delegated_balance : Tez.t;
-  min_delegated_in_current_cycle : Tez.t;
+  min_delegated_in_current_cycle : Tez.t * Level_repr.t option;
   total_delegated_stake : Tez.t;
   staking_denominator : Staking_pseudotoken.t;
   deactivated : bool;
@@ -199,7 +206,9 @@ let info_encoding =
           (opt "frozen_deposits_limit" Tez.encoding)
           (req "delegated_contracts" (list Contract.encoding))
           (req "delegated_balance" Tez.encoding)
-          (req "min_delegated_in_current_cycle" Tez.encoding)
+          (req
+             "min_delegated_in_current_cycle"
+             min_delegated_in_current_cycle_encoding)
           (req "deactivated" bool)
           (req "grace_period" Cycle.encoding))
        (merge_objs
@@ -419,9 +428,10 @@ module S = struct
     RPC_service.get_service
       ~description:
         "Returns the minimum of delegated tez (in mutez) over the current \
-         cycle."
+         cycle and the block level where this value was last updated (* Level \
+         is `None` when decoding values from protocol O)."
       ~query:RPC_query.empty
-      ~output:Tez.encoding
+      ~output:min_delegated_in_current_cycle_encoding
       RPC_path.(path / "min_delegated_in_current_cycle")
 
   let deactivated =
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_services.mli b/src/proto_019_PtParisA/lib_protocol/delegate_services.mli
index 16bdf5f9dd9c02b9f9a03d08f0716df4a550cd83..60b8df658ecf86ff1be99a807898e291e8e3e6fe 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_services.mli
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_services.mli
@@ -61,7 +61,7 @@ type info = {
   frozen_deposits_limit : Tez.t option;
   delegated_contracts : Contract.t list;
   delegated_balance : Tez.t;
-  min_delegated_in_current_cycle : Tez.t;
+  min_delegated_in_current_cycle : Tez.t * Level_repr.t option;
   total_delegated_stake : Tez.t;
   staking_denominator : Staking_pseudotoken.t;
   deactivated : bool;
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.ml b/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.ml
index b73cdc7a69e9093ee0c8c27e8ece5a0e32384372..c22b7d0b04745f2e9119c1fdc0c45369c905e645 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.ml
@@ -25,35 +25,6 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(* TODO #6918: Remove after P *)
-let update_slashing_storage_for_p ctxt =
-  let open Lwt_result_syntax in
-  Storage.Delegates.fold
-    ctxt
-    ~init:(Ok ctxt)
-    ~order:`Undefined
-    ~f:(fun delegate ctxt ->
-      let*? ctxt in
-      let delegate = Contract_repr.Implicit delegate in
-      let* slashed_history =
-        Storage.Contract.Slashed_deposits__Oxford.find ctxt delegate
-      in
-      match slashed_history with
-      | None -> return ctxt
-      | Some slashed_history ->
-          let slashed_history =
-            List.map
-              (fun (cycle, percentage) ->
-                (cycle, Percentage.convert_from_o_to_p percentage))
-              slashed_history
-          in
-          let*! ctxt =
-            Storage.Contract.Slashed_deposits.add ctxt delegate slashed_history
-          in
-          Storage.Contract.Slashed_deposits__Oxford.remove_existing
-            ctxt
-            delegate)
-
 type reward_and_burn = {reward : Tez_repr.t; amount_to_burn : Tez_repr.t}
 
 type punishing_amounts = {
@@ -257,10 +228,37 @@ let apply_block_denunciations ctxt current_cycle block_denunciations_map =
                 0) ;
             (* Validate ensures that [denunciations] contains [delegate] at most once *)
             let delegate_contract = Contract_repr.Implicit delegate in
+            (* Oxford values *)
+            let* slash_history_opt_o =
+              Storage.Contract.Slashed_deposits__Oxford.find
+                ctxt
+                delegate_contract
+            in
+            let slash_history_o =
+              Option.value slash_history_opt_o ~default:[]
+              |> List.map (fun (a, b) -> (a, Percentage.convert_from_o_to_p b))
+            in
+
             let* slash_history_opt =
-              Storage.Contract.Slashed_deposits.find ctxt delegate_contract
+              Storage.Slashed_deposits.find ctxt delegate
             in
             let slash_history = Option.value slash_history_opt ~default:[] in
+
+            (* Concatenate both, Oxford first *)
+            let slash_history =
+              List.fold_left
+                (fun acc (cycle, percentage) ->
+                  Storage.Slashed_deposits_history.add cycle percentage acc)
+                slash_history_o
+                slash_history
+            in
+
+            let*! ctxt =
+              Storage.Contract.Slashed_deposits__Oxford.remove
+                ctxt
+                delegate_contract
+            in
+
             let previous_total_slashing_percentage =
               Storage.Slashed_deposits_history.get level.cycle slash_history
             in
@@ -271,10 +269,7 @@ let apply_block_denunciations ctxt current_cycle block_denunciations_map =
                 slash_history
             in
             let*! ctxt =
-              Storage.Contract.Slashed_deposits.add
-                ctxt
-                delegate_contract
-                slash_history
+              Storage.Slashed_deposits.add ctxt delegate slash_history
             in
             let new_total_slashing_percentage =
               Storage.Slashed_deposits_history.get level.cycle slash_history
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.mli b/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.mli
index 7e525f4dd16298bb01b8215f903c031a63ba41a0..02e0705ade682174e5f0f76670837474b4cdc191 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.mli
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_slashed_deposits_storage.mli
@@ -25,10 +25,14 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(** This module maintains the storage related to slashing of delegates for
-   double signing. In particular, it is responsible for maintaining the
-   {!Storage.Already_denounced}, {!Storage.Contract.Slashed_deposits}, and
-   {!Storage.Pending_denunciations} tables.
+(** This module handles the slashing of delegates for double signing.
+
+    It is behind the {!Alpha_context} abstraction: some functions are
+    re-exported in {!Alpha_context.Delegate}.
+
+    This module is responsible for maintaining the
+    {!Storage.Contract.Slashed_deposits} table. It also interacts
+    heavily with {!Pending_denunciations_storage}.
 *)
 
 (** The [reward_and_burn] type embeds amounts involved when slashing a
@@ -83,9 +87,6 @@ val punish_double_signing :
 val apply_and_clear_denunciations :
   Raw_context.t -> (Raw_context.t * Receipt_repr.balance_updates) tzresult Lwt.t
 
-val update_slashing_storage_for_p :
-  Raw_context.t -> Raw_context.t tzresult Lwt.t
-
 module For_RPC : sig
   (** [get_estimated_shared_pending_slashed_amount ctxt delegate]
       returns the estimated shared pending slashed amount of the given [delegate]
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_storage.ml b/src/proto_019_PtParisA/lib_protocol/delegate_storage.ml
index 75fea2802c5cee71cab82b933eebafbcf421252d..f978a854ecb8e978db2f74bc04165bc40e892098 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_storage.ml
@@ -400,10 +400,24 @@ module For_RPC = struct
       let+ staking_balance =
         Stake_storage.get_full_staking_balance ctxt delegate
       in
-      Full_staking_balance_repr.min_delegated_in_cycle
-        ~current_cycle
-        staking_balance
-    else return Tez_repr.zero
+      let min_delegated =
+        Full_staking_balance_repr.min_delegated_in_cycle
+          ~current_cycle
+          staking_balance
+      in
+      let level_of_min_delegated =
+        match
+          Full_staking_balance_repr.Internal_for_tests_and_RPCs
+          .level_of_min_delegated
+            staking_balance
+        with
+        | None -> None
+        | Some level ->
+            if Cycle_repr.(level.cycle < current_cycle) then None
+            else Some level
+      in
+      (min_delegated, level_of_min_delegated)
+    else return (Tez_repr.zero, None)
 
   let delegated_balance ctxt delegate =
     let open Lwt_result_syntax in
diff --git a/src/proto_019_PtParisA/lib_protocol/delegate_storage.mli b/src/proto_019_PtParisA/lib_protocol/delegate_storage.mli
index 58c91f85e8e53aa60c8252bd332f4c54671c17b7..a5ef9fd9f9e26fcfa5526be27e9de777bf7be092 100644
--- a/src/proto_019_PtParisA/lib_protocol/delegate_storage.mli
+++ b/src/proto_019_PtParisA/lib_protocol/delegate_storage.mli
@@ -162,5 +162,7 @@ module For_RPC : sig
     Raw_context.t -> Signature.Public_key_hash.t -> Tez_repr.t tzresult Lwt.t
 
   val min_delegated_in_current_cycle :
-    Raw_context.t -> Signature.Public_key_hash.t -> Tez_repr.t tzresult Lwt.t
+    Raw_context.t ->
+    Signature.Public_key_hash.t ->
+    (Tez_repr.t * Level_repr.t option) tzresult Lwt.t
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/dune b/src/proto_019_PtParisA/lib_protocol/dune
index 387c850707459e59f836be6f63274f945243d0ef..1fa08bdbc8dbdb794bffede4ab1736e19e057d53 100644
--- a/src/proto_019_PtParisA/lib_protocol/dune
+++ b/src/proto_019_PtParisA/lib_protocol/dune
@@ -316,7 +316,7 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Hashed.Protocol_hash.of_b58check_exn \"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5\"\nlet name = Tezos_protocol_environment_019_PtParisA.Name.name\ninclude Tezos_raw_protocol_019_PtParisA\ninclude Tezos_raw_protocol_019_PtParisA.Main\n")))
+   "\nlet hash = Tezos_crypto.Hashed.Protocol_hash.of_b58check_exn \"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc\"\nlet name = Tezos_protocol_environment_019_PtParisA.Name.name\ninclude Tezos_raw_protocol_019_PtParisA\ninclude Tezos_raw_protocol_019_PtParisA.Main\n")))
 
 (rule
  (targets tezos_protocol_019_PtParisA.ml)
diff --git a/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.ml b/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.ml
index a181714a85ed30ea1a381f8dc595f33e24d08356..d1c47db3e579e13c98376cab5385a4fde50813c4 100644
--- a/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.ml
@@ -12,9 +12,12 @@ type t =
       delegate : Signature.public_key_hash;
     }
   | Shared_between_stakers of {delegate : Signature.public_key_hash}
+  | Baker_edge of Signature.public_key_hash
 
 let baker pkh = Baker pkh
 
+let baker_edge pkh = Baker_edge pkh
+
 let single_staker ~staker ~delegate =
   match (staker : Contract_repr.t) with
   | Implicit pkh when Signature.Public_key_hash.(pkh = delegate) -> Baker pkh
@@ -35,7 +38,13 @@ let encoding =
     obj1 (req "delegate" Signature.Public_key_hash.encoding)
   in
   let baker_tag = 2 in
-  let baker_encoding = obj1 (req "baker" Signature.Public_key_hash.encoding) in
+  let baker_encoding =
+    obj1 (req "baker_own_stake" Signature.Public_key_hash.encoding)
+  in
+  let baker_edge_tag = 3 in
+  let baker_edge_encoding =
+    obj1 (req "baker_edge" Signature.Public_key_hash.encoding)
+  in
   def
     ~title:"frozen_staker"
     ~description:
@@ -49,7 +58,8 @@ let encoding =
          | Single_staker {staker; delegate} ->
              matched single_tag single_encoding (staker, delegate)
          | Shared_between_stakers {delegate} ->
-             matched shared_tag shared_encoding delegate)
+             matched shared_tag shared_encoding delegate
+         | Baker_edge baker -> matched baker_edge_tag baker_edge_encoding baker)
        [
          case
            ~title:"Single"
@@ -72,6 +82,12 @@ let encoding =
            baker_encoding
            (function Baker baker -> Some baker | _ -> None)
            (fun baker -> Baker baker);
+         case
+           ~title:"Baker_edge"
+           (Tag baker_edge_tag)
+           baker_edge_encoding
+           (function Baker_edge baker -> Some baker | _ -> None)
+           (fun baker -> Baker_edge baker);
        ]
 
 let compare sa sb =
@@ -88,3 +104,6 @@ let compare sa sb =
       Signature.Public_key_hash.compare da db
   | Single_staker _, Shared_between_stakers _ -> -1
   | Shared_between_stakers _, Single_staker _ -> 1
+  | Baker_edge ba, Baker_edge bb -> Signature.Public_key_hash.compare ba bb
+  | Baker_edge _, _ -> -1
+  | _, Baker_edge _ -> 1
diff --git a/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.mli b/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.mli
index 391e97e32ac45c0537ef6f76fe95dd6625a5b11b..5e13de5e3bad2c6ad8e554ba1c4e9ff7ecf086d8 100644
--- a/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/frozen_staker_repr.mli
@@ -5,10 +5,13 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(** Adding and removing stake can be done from/toward a delegate, one
-   of its staker, or all its stakers at
-   once. We need to distinguish these cases to enforce the staking
-   over baking limit. *)
+(** Adding and removing stake can be done from/toward the funds
+    - a delegate directly stakes,
+    - one of its stakers stakes,
+    - all its stakers stakes at once,
+    - or from the edge a delegate may have on its stakers rewards.
+   We need to distinguish these cases to enforce the staking over baking
+   limit. *)
 type t = private
   | Baker of Signature.public_key_hash  (** The baker itself. *)
   | Single_staker of {
@@ -17,9 +20,13 @@ type t = private
     }  (** A single staker, cannot be the delegate. *)
   | Shared_between_stakers of {delegate : Signature.public_key_hash}
       (** The delegate's stakers simultaneously (delegate excluded). *)
+  | Baker_edge of Signature.public_key_hash
+      (** The baker edge over its stakers rewards. *)
 
 val baker : Signature.public_key_hash -> t
 
+val baker_edge : Signature.public_key_hash -> t
+
 val single_staker :
   staker:Contract_repr.t -> delegate:Signature.public_key_hash -> t
 
diff --git a/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.ml b/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.ml
index 767a4d3619e30247d1a1dd7c01d643e0cf180df1..4322c273bdc9e2a4d150bb21b4465951eee4dc2f 100644
--- a/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.ml
@@ -5,21 +5,39 @@
 (*                                                                           *)
 (*****************************************************************************)
 
+(** This module is responsible for the construction, observation and encoding of
+    full staking balances that are maintained to be used at cycle end to compute
+    staking rights.
+
+    The module will handle a lazy migration starting at protocol P that adds two
+    new fields to the balance, the minimal delegated balance over the cycle and
+    the last level at which it has been modified.
+    As there is no trivial default value for Level_repr, the
+    level_of_min_delegated is optional but the module must preserve the
+    invariant that if a min_delegated_in_cycle has been stored, a level is
+    stored with it.
+*)
+
 type t = {
   own_frozen : Tez_repr.t;
   staked_frozen : Tez_repr.t;
   delegated : Tez_repr.t;
   min_delegated_in_cycle : Tez_repr.t;
-  cycle_of_min_delegated : Cycle_repr.t;
+  level_of_min_delegated : Level_repr.t option;
 }
 
-let init ~own_frozen ~staked_frozen ~delegated ~current_cycle =
+let cycle_of_min_delegated (level_of_min_delegated : Level_repr.t option) =
+  match level_of_min_delegated with
+  | None -> Cycle_repr.root
+  | Some l -> l.cycle
+
+let init ~own_frozen ~staked_frozen ~delegated ~current_level =
   {
     own_frozen;
     staked_frozen;
     delegated;
     min_delegated_in_cycle = delegated;
-    cycle_of_min_delegated = current_cycle;
+    level_of_min_delegated = Some current_level;
   }
 
 let encoding =
@@ -27,12 +45,13 @@ let encoding =
   (* This encoding is backward-compatible with the encoding used in Oxford, so
      as to avoid a stitching in P. It will act as a lazy migration.
      The case in which [added_in_p] is [None] happen only for pre-existing
-     values in the storage. For them, using [(delegated, Cycle_repr.root)]
-     should behave correctly. *)
+     values in the storage.
+     For them, using [(delegated, None)] and using Cycle_repr.root when no level
+     is set will behave correctly. *)
   let added_in_p =
     obj2
       (req "min_delegated_in_cycle" Tez_repr.encoding)
-      (req "cycle_of_min_delegated" Cycle_repr.encoding)
+      (req "level_of_min_delegated" (option Level_repr.encoding))
   in
   conv
     (fun {
@@ -40,28 +59,28 @@ let encoding =
            staked_frozen;
            delegated;
            min_delegated_in_cycle;
-           cycle_of_min_delegated;
+           level_of_min_delegated;
          } ->
       ( own_frozen,
         staked_frozen,
         delegated,
-        Some (min_delegated_in_cycle, cycle_of_min_delegated) ))
+        Some (min_delegated_in_cycle, level_of_min_delegated) ))
     (fun (own_frozen, staked_frozen, delegated, added_in_p_opt) ->
-      let min_delegated_in_cycle, cycle_of_min_delegated =
-        added_in_p_opt |> Option.value ~default:(delegated, Cycle_repr.root)
+      let min_delegated_in_cycle, level_of_min_delegated =
+        added_in_p_opt |> Option.value ~default:(delegated, None)
       in
       {
         own_frozen;
         staked_frozen;
         delegated;
         min_delegated_in_cycle;
-        cycle_of_min_delegated;
+        level_of_min_delegated;
       })
     (obj4
        (req "own_frozen" Tez_repr.encoding)
        (req "staked_frozen" Tez_repr.encoding)
        (req "delegated" Tez_repr.encoding)
-       (varopt "min_delegated_in_cycle_and_cycle" added_in_p))
+       (varopt "min_delegated_in_cycle_and_level" added_in_p))
 
 let voting_weight
     {
@@ -69,7 +88,7 @@ let voting_weight
       staked_frozen;
       delegated;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   let open Result_syntax in
   let* frozen = Tez_repr.(own_frozen +? staked_frozen) in
@@ -82,7 +101,7 @@ let apply_slashing ~percentage
       staked_frozen;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
   let remaining_percentage = Percentage.neg percentage in
   let own_frozen =
@@ -96,7 +115,7 @@ let apply_slashing ~percentage
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated;
+    level_of_min_delegated;
   }
 
 let own_frozen
@@ -105,7 +124,7 @@ let own_frozen
       staked_frozen = _;
       delegated = _;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   own_frozen
 
@@ -115,7 +134,7 @@ let staked_frozen
       staked_frozen;
       delegated = _;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   staked_frozen
 
@@ -125,7 +144,7 @@ let total_frozen
       staked_frozen;
       delegated = _;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   Tez_repr.(own_frozen +? staked_frozen)
 
@@ -135,7 +154,7 @@ let current_delegated
       staked_frozen = _;
       delegated;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   delegated
 
@@ -150,8 +169,9 @@ let min_delegated_in_cycle ~current_cycle
       staked_frozen = _;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
+  let cycle_of_min_delegated = cycle_of_min_delegated level_of_min_delegated in
   if Cycle_repr.(cycle_of_min_delegated < current_cycle) then delegated
   else (
     assert (Cycle_repr.(cycle_of_min_delegated = current_cycle)) ;
@@ -163,7 +183,7 @@ let current_total
       staked_frozen;
       delegated;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   let open Result_syntax in
   let* total_frozen = Tez_repr.(own_frozen +? staked_frozen) in
@@ -175,7 +195,7 @@ let own_ratio
       staked_frozen;
       delegated = _;
       min_delegated_in_cycle = _;
-      cycle_of_min_delegated = _;
+      level_of_min_delegated = _;
     } =
   if Tez_repr.(staked_frozen = zero) then (1L, 1L)
   else if Tez_repr.(own_frozen = zero) then (0L, 1L)
@@ -201,29 +221,35 @@ let has_minimal_stake_to_be_considered ~minimal_stake full_staking_balance =
       (* If the total overflows, we are definitely over the minimal stake. *)
   | Ok staking_balance -> Tez_repr.(staking_balance >= minimal_stake)
 
-let remove_delegated ~current_cycle ~amount
+let remove_delegated ~(current_level : Level_repr.t) ~amount
     {
       own_frozen;
       staked_frozen;
       delegated;
-      min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      min_delegated_in_cycle = old_min_delegated_in_cycle;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
   let+ delegated = Tez_repr.(delegated -? amount) in
-  let min_delegated_in_cycle =
+  let cycle_of_min_delegated = cycle_of_min_delegated level_of_min_delegated in
+  let current_cycle = current_level.cycle in
+  let min_delegated_in_cycle, level_of_min_delegated =
     if Cycle_repr.(cycle_of_min_delegated < current_cycle) then
-      (* after decrease *) delegated
+      (* after decrease *) (delegated, Some current_level)
     else (
       assert (Cycle_repr.(cycle_of_min_delegated = current_cycle)) ;
-      Tez_repr.min delegated min_delegated_in_cycle)
+      let minimum = Tez_repr.min delegated old_min_delegated_in_cycle in
+      ( minimum,
+        if Tez_repr.(minimum = old_min_delegated_in_cycle) then
+          level_of_min_delegated
+        else Some current_level ))
   in
   {
     own_frozen;
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated = current_cycle;
+    level_of_min_delegated;
   }
 
 let remove_own_frozen ~amount
@@ -232,7 +258,7 @@ let remove_own_frozen ~amount
       staked_frozen;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
   let+ own_frozen = Tez_repr.(own_frozen -? amount) in
@@ -241,7 +267,7 @@ let remove_own_frozen ~amount
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated;
+    level_of_min_delegated;
   }
 
 let remove_staked_frozen ~amount
@@ -250,7 +276,7 @@ let remove_staked_frozen ~amount
       staked_frozen;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
   let+ staked_frozen = Tez_repr.(staked_frozen -? amount) in
@@ -259,24 +285,26 @@ let remove_staked_frozen ~amount
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated;
+    level_of_min_delegated;
   }
 
-let add_delegated ~current_cycle ~amount
+let add_delegated ~(current_level : Level_repr.t) ~amount
     {
       own_frozen;
       staked_frozen;
       delegated;
-      min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      min_delegated_in_cycle = old_min_delegated_in_cycle;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
-  let min_delegated_in_cycle =
+  let cycle_of_min_delegated = cycle_of_min_delegated level_of_min_delegated in
+  let current_cycle = current_level.cycle in
+  let min_delegated_in_cycle, level_of_min_delegated =
     if Cycle_repr.(cycle_of_min_delegated < current_cycle) then
-      (* before increase *) delegated
+      (* before increase *) (delegated, Some current_level)
     else (
       assert (Cycle_repr.(cycle_of_min_delegated = current_cycle)) ;
-      min_delegated_in_cycle)
+      (old_min_delegated_in_cycle, level_of_min_delegated))
   in
   let+ delegated = Tez_repr.(delegated +? amount) in
   {
@@ -284,7 +312,7 @@ let add_delegated ~current_cycle ~amount
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated = current_cycle;
+    level_of_min_delegated;
   }
 
 let add_own_frozen ~amount
@@ -293,7 +321,7 @@ let add_own_frozen ~amount
       staked_frozen;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
   let+ own_frozen = Tez_repr.(own_frozen +? amount) in
@@ -302,7 +330,7 @@ let add_own_frozen ~amount
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated;
+    level_of_min_delegated;
   }
 
 let add_staked_frozen ~amount
@@ -311,7 +339,7 @@ let add_staked_frozen ~amount
       staked_frozen;
       delegated;
       min_delegated_in_cycle;
-      cycle_of_min_delegated;
+      level_of_min_delegated;
     } =
   let open Result_syntax in
   let+ staked_frozen = Tez_repr.(staked_frozen +? amount) in
@@ -320,5 +348,27 @@ let add_staked_frozen ~amount
     staked_frozen;
     delegated;
     min_delegated_in_cycle;
-    cycle_of_min_delegated;
+    level_of_min_delegated;
   }
+
+module Internal_for_tests_and_RPCs = struct
+  let min_delegated_in_cycle
+      {
+        own_frozen = _;
+        staked_frozen = _;
+        delegated = _;
+        min_delegated_in_cycle;
+        level_of_min_delegated = _;
+      } =
+    min_delegated_in_cycle
+
+  let level_of_min_delegated
+      {
+        own_frozen = _;
+        staked_frozen = _;
+        delegated = _;
+        min_delegated_in_cycle = _;
+        level_of_min_delegated;
+      } =
+    level_of_min_delegated
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.mli b/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.mli
index c55ec8ba76e0d95ae697a8bd0270965e6bf042c6..c628320ce32888240e5ac3de496dcd1b8cb4b0b3 100644
--- a/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/full_staking_balance_repr.mli
@@ -11,7 +11,7 @@ val init :
   own_frozen:Tez_repr.t ->
   staked_frozen:Tez_repr.t ->
   delegated:Tez_repr.t ->
-  current_cycle:Cycle_repr.t ->
+  current_level:Level_repr.t ->
   t
 
 val encoding : t Data_encoding.t
@@ -45,15 +45,21 @@ val has_minimal_frozen_stake : minimal_frozen_stake:Tez_repr.t -> t -> bool
 val has_minimal_stake_to_be_considered : minimal_stake:Tez_repr.t -> t -> bool
 
 val remove_delegated :
-  current_cycle:Cycle_repr.t -> amount:Tez_repr.t -> t -> t tzresult
+  current_level:Level_repr.t -> amount:Tez_repr.t -> t -> t tzresult
 
 val remove_own_frozen : amount:Tez_repr.t -> t -> t tzresult
 
 val remove_staked_frozen : amount:Tez_repr.t -> t -> t tzresult
 
 val add_delegated :
-  current_cycle:Cycle_repr.t -> amount:Tez_repr.t -> t -> t tzresult
+  current_level:Level_repr.t -> amount:Tez_repr.t -> t -> t tzresult
 
 val add_own_frozen : amount:Tez_repr.t -> t -> t tzresult
 
 val add_staked_frozen : amount:Tez_repr.t -> t -> t tzresult
+
+module Internal_for_tests_and_RPCs : sig
+  val min_delegated_in_cycle : t -> Tez_repr.t
+
+  val level_of_min_delegated : t -> Level_repr.t option
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/init_storage.ml b/src/proto_019_PtParisA/lib_protocol/init_storage.ml
index 5ee8149b4cd743fc9c041c631fd70ec6b3a53aea..020f518cf36d1c43f13e6139d64a934e4f1b6453 100644
--- a/src/proto_019_PtParisA/lib_protocol/init_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/init_storage.ml
@@ -222,6 +222,9 @@ let cleanup_values_for_protocol_p ctxt
   in
   return ctxt
 
+let reset_adaptive_issuance_ema_for_p ctxt =
+  Storage.Adaptive_issuance.Launch_ema.add ctxt 0l
+
 (** Updates the total supply with refined estimation at the activation
     of P using measures from
     https://gitlab.com/tezos/tezos/-/merge_requests/11978.
@@ -343,11 +346,8 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract
         let* ctxt =
           cleanup_values_for_protocol_p ctxt previous_proto_constants level
         in
-        (* Update the percentage representation of the stored slashes *)
-        let* ctxt =
-          Delegate_slashed_deposits_storage.update_slashing_storage_for_p ctxt
-        in
         let* ctxt = update_total_supply_for_p chain_id ctxt in
+        let*! ctxt = reset_adaptive_issuance_ema_for_p ctxt in
         return (ctxt, [])
   in
   let* ctxt =
diff --git a/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.ml b/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.ml
index e30a85cf4eb34a13adb885fb74041d6642969232..ef23bdffa61f212353329b6293c23eb8b388ba70 100644
--- a/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.ml
+++ b/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2020 Nomadic Labs                 *)
-(*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2020 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.mli b/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.mli
index 17637213d75bbeb8e4bedf61b5a3b016e4cf4454..928117683ea251fda3b66227f725567023261f04 100644
--- a/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.mli
+++ b/src/proto_019_PtParisA/lib_protocol/lazy_storage_diff.mli
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2020 Nomadic Labs                 *)
-(*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining 'a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2020 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/level_repr.ml b/src/proto_019_PtParisA/lib_protocol/level_repr.ml
index f3daac4d0d5ec87649d484fab32c89e0ff2efbac..7805ce15cf2c2d08ad7fb76b4df7398ee7c343f4 100644
--- a/src/proto_019_PtParisA/lib_protocol/level_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/level_repr.ml
@@ -355,4 +355,13 @@ module Internal_for_tests = struct
       level_position =
         Int32.add level.level_position (Int32.of_int (n * blocks_per_cycle));
     }
+
+  let root =
+    {
+      level = Raw_level_repr.root;
+      level_position = 0l;
+      cycle = Cycle_repr.root;
+      cycle_position = 0l;
+      expected_commitment = false;
+    }
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/level_repr.mli b/src/proto_019_PtParisA/lib_protocol/level_repr.mli
index 0c2800556dc296a572ae84f080a6e0f93a58e060..7b208cd6ecf104e09f05957f1c00fdb5453aaf52 100644
--- a/src/proto_019_PtParisA/lib_protocol/level_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/level_repr.mli
@@ -116,6 +116,8 @@ module Internal_for_tests : sig
   val add_level : t -> int -> t
 
   val add_cycles : blocks_per_cycle:int -> t -> int -> t
+
+  val root : t
 end
 
 (**/**)
diff --git a/src/proto_019_PtParisA/lib_protocol/liquidity_baking_cpmm.ml b/src/proto_019_PtParisA/lib_protocol/liquidity_baking_cpmm.ml
index be63503aa883a19e8526e5182b8834a08968f9b8..184e4d80d1399ef3ee4d49ee47881b5d6134cfe3 100644
--- a/src/proto_019_PtParisA/lib_protocol/liquidity_baking_cpmm.ml
+++ b/src/proto_019_PtParisA/lib_protocol/liquidity_baking_cpmm.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 let script_hex : Hex.t =
   `Hex
     "02000011c405000764076407640865046e00000006256f776e6572076504620000000d256d696e4c71744d696e7465640765046200000013256d6178546f6b656e734465706f7369746564046b0000000925646561646c696e650000000d256164644c6971756964697479046c000000082564656661756c7407640865046e0000000325746f076504620000000a256c71744275726e65640765046a00000010256d696e58747a57697468647261776e0765046200000013256d696e546f6b656e7357697468647261776e046b0000000925646561646c696e65000000102572656d6f76654c69717569646974790865046e00000015256f7574707574446578746572436f6e74726163740765046200000010256d696e546f6b656e73426f756768740765046e0000000325746f076504620000000b25746f6b656e73536f6c64046b0000000925646561646c696e650000000d25746f6b656e546f546f6b656e07640865046e0000000325746f076504620000000b25746f6b656e73536f6c640765046a0000000d256d696e58747a426f75676874046b0000000925646561646c696e650000000b25746f6b656e546f58747a0865046e0000000325746f0765046200000010256d696e546f6b656e73426f75676874046b0000000925646561646c696e650000000b2578747a546f546f6b656e0501076504620000000a25746f6b656e506f6f6c0765046a000000082578747a506f6f6c0765046200000009256c7174546f74616c0765046e0000000d25746f6b656e41646472657373046e0000000b256c71744164647265737305020200000f7203210317034c0316072e02000009d1072e020000035a072e020000032603210317034c0316034c03210317034c0316034c03210317034c0316034c034003190328072c020000000c05200004074303620003032702000002ea0743036a000105700004032105710005031703160322072f0200000013074303680100000008444956206279203003270200000000031603130743036a0001034c0322072f02000000130743036801000000084449562062792030032702000000000316034c0321057100020570000603210571000703170317031605700002032105710003033a0322072f020000001307430368010000000844495620627920300327020000000003160570000205700006032105710007031605700003033a0322072f020000001307430368010000000844495620627920300327020000002a03210317034c03160743036200000570000203190325072c02000000000200000008074303620001031205700002034c0321057100020319032a072c020000000c05200005074303620004032702000001b60571000203210571000303190337072c020000000c0520000407430362000503270200000190057000030321057100040317031703170570000203210571000305700005032105710006031703170316031203420570000403210571000503170316034205700004032105710005031603420317034c032105710002057000050321057100060316031203420321031703170313057000060317031603120342034c03160342034c03490354034203480342034c032105710002034c03210317034c0316034c03210317034c031605700003031703170317031606550765036e0765036e036200000009257472616e73666572072f0200000008074303620000032702000000000743036a000005700003057000030342057000030342034d05700002033005700003034205700002032105710003034c03210317034c031605700002031703170317031706550765045b00000009257175616e74697479046e00000007257461726765740000000b256d696e744f724275726e072f020000000807430362000c032702000000000743036a000005700002057000030342034d05700002053d036d05700002031b05700002031b0342020000002803200321031703170313057000020321057100030317031603120342034c03160342053d036d0342020000066b072e020000038d03210317034c0316034c03210317034c0316034c03210317034c0316034c03210317034c0316034c034003190328072c020000000c05200005074303620003032702000003470743036a000003130319032a072c020000000c0520000507430362000a03270200000323057000040321057100050317031703160743036a000105700006032105710007031703160322072f0200000013074303680100000008444956206279203003270200000000031605700004032105710005033a0322072f020000001307430368010000000844495620627920300327020000000003160743036a0001034c033a0570000503210571000603170317031605700006032105710007031605700005032105710006033a0322072f02000000130743036801000000084449562062792030032702000000000316057000030570000203210571000303190337072c020000000c0520000607430362000b0327020000022e05700002034c03210571000203190337072c020000000c0520000507430362000d032702000002060570000203210571000305700005032105710006031703170316034b0356072f020000000807430362000e03270200000000034c032105710002057000060321057100070316034b0356072f020000000807430362000f03270200000000057000040743035b0000034b0348034205700006032105710007034c03210317034c031605700002031703170317031706550765045b00000009257175616e74697479046e00000007257461726765740000000b256d696e744f724275726e072f020000000807430362000c032702000000000743036a000005700002057000030342034d0570000305700005032105710006034203490354034205700006032105710007034c03210317034c0316034c03210317034c031605700003031703170317031606550765036e0765036e036200000009257472616e73666572072f0200000008074303620000032702000000000743036a000005700003057000030342057000030342034d05700004032105710005057000060555036c072f020000000807430362000903270200000000034c0743036c030b034d0570000603210571000703170317057000060570000703210571000803170316034b034205700006031603420321031703170317057000060342034c032105710002031703160342034c031603420317057000040342053d036d05700002031b05700002031b05700002031b034202000002d203210317034c0316034c03210317034c0316034c03210317034c0316034c03210317034c03160570000406550765046e0000000325746f0765046200000010256d696e546f6b656e73426f75676874046b0000000925646561646c696e650000000b2578747a546f546f6b656e072f020000000807430362001f032702000000000743036a000003130319032a072c020000000c0520000607430362000a0327020000022d05700002032105710003034003190328072c020000000c05200006074303620003032702000002050743036200a70f05700002032105710003033a0743036200a80f057000070321057100080316033a031205700006032105710007031703160743036200a70f05700004032105710005033a033a0322072f020000001307430368010000000844495620627920300327020000000003160743036200a80f0743036200a70f05700002032105710003033a0322072f02000000130743036801000000084449562062792030032702000000000316057000070321057100080317057000040321057100050570000903210571000a031603120342032103170317057000030321057100040570000a03170316034b0342034c031603420570000403490354034203480342034c032105710002034c03210317034c0316034c03210317034c031605700003031703170317031606550765036e0765036e036200000009257472616e73666572072f0200000008074303620000032702000000000743036a000005700003057000030342057000030342034d057000040570000303210571000405700006057000080342057000070342034d0570000305700004034b0743036e0100000024747a314b65326837734464616b484a5168385758345a3337326475314b4368736b7379550555036c072f020000000807430362000903270200000000034c0743036c030b034d05700003053d036d05700002031b05700002031b05700002031b0342020000058d072e02000002cc03210317034c0316034c03210317034c0316034c03210317034c0316034c034003190328072c020000000c05200004074303620003032702000002900743036a000003130319032a072c020000000c0520000407430362000a0327020000026c0743036200a70f05700002032105710003033a0743036200a80f057000050321057100060316033a03120743036a000105700005032105710006031703160322072f020000001307430368010000000844495620627920300327020000000003160743036200a70f05700004032105710005033a033a0322072f020000001307430368010000000844495620627920300327020000000003160743036a0001034c033a0743036200a80f0743036200a70f05700002032105710003033a0322072f0200000013074303680100000008444956206279203003270200000000031605700002034c03210571000203190337072c020000000a032007430362000803270200000000057000020321057100030349035403420348034205700005032105710006034c03210317034c0316034c03210317034c031605700003031703170317031606550765036e0765036e036200000009257472616e73666572072f0200000008074303620000032702000000000743036a000005700003057000030342057000030342034d034c032105710002057000050555036c072f020000000807430362000903270200000000034c0743036c030b034d0570000503210571000603170570000505700006032105710007031603120342032103170317057000050321057100060570000703170316034b0342034c031603420570000305700004034b0743036e0100000024747a314b65326837734464616b484a5168385758345a3337326475314b4368736b7379550555036c072f020000000807430362000903270200000000034c0743036c030b034d034c053d036d05700002031b05700002031b05700002031b034202000002b503210317034c0316034c03210317034c0316034c034003190328072c020000000c05200003074303620003032702000002830743036a000105700003032105710004031703160322072f0200000013074303680100000008444956206279203003270200000000031603130743036a0001034c0322072f020000001307430368010000000844495620627920300327020000000003160743036200a80f0743036200a70f05700002032105710003033a0322072f02000000130743036801000000084449562062792030032702000000000316032105700002034b03110743036200a70f05700002032105710003033a0743036200a80f05700004033a03120570000503210571000603160743036200a70f05700004032105710005033a033a0322072f0200000013074303680100000008444956206279203003270200000000031605700003034c03210571000203190337072c020000000a0320074303620012032702000000000321057000050321057100060316034b0356072f02000000080743036200130327020000000005700005032105710006031703170743036a000105700005033a05700006032105710007031703160312034205700005031603420317034c0342034c057000030342034903540342034c032105710002034c03210317034c0316034c03210317034c031605700003031703170317031606550765036e0765036e036200000009257472616e73666572072f0200000008074303620000032702000000000743036a000005700003057000030342057000030342034d0743036a000105700003033a0743036e0100000024747a314b65326837734464616b484a5168385758345a3337326475314b4368736b7379550555036c072f020000000807430362000903270200000000034c0743036c030b034d05700002053d036d05700002031b05700002031b0342"
diff --git a/src/proto_019_PtParisA/lib_protocol/liquidity_baking_lqt.ml b/src/proto_019_PtParisA/lib_protocol/liquidity_baking_lqt.ml
index 80c92e523d0fab781e1444448cd68869f5dcf1d4..7e85b96172efeffb916284741df0563c00e9d836 100644
--- a/src/proto_019_PtParisA/lib_protocol/liquidity_baking_lqt.ml
+++ b/src/proto_019_PtParisA/lib_protocol/liquidity_baking_lqt.ml
@@ -1,3 +1,10 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 let script_hex : Hex.t =
   `Hex
     "020000070005000764076407640865046e00000008257370656e6465720462000000062576616c75650000000825617070726f766508650865046e00000006256f776e6572046e00000008257370656e646572000000082572657175657374065a0362000000092563616c6c6261636b0000000d25676574416c6c6f77616e636507640865046e00000006256f776e6572065a0362000000092563616c6c6261636b0000000b2567657442616c616e63650865046c000000082572657175657374065a0362000000092563616c6c6261636b0000000f25676574546f74616c537570706c7907640865045b00000009257175616e74697479046e00000007257461726765740000000b256d696e744f724275726e0865046e000000052566726f6d0765046e0000000325746f0462000000062576616c756500000009257472616e73666572050107650861036e03620000000725746f6b656e73076508610765046e00000006256f776e6572046e00000008257370656e64657203620000000b25616c6c6f77616e6365730765046e000000062561646d696e04620000000d25746f74616c5f737570706c7905020200000552032103170743036a000003130319033c072c020000001607430368010000000b446f6e7453656e6454657a03270200000000034c0316072e02000001b2072e0200000132072e02000000e2034c03210571000203170316034c0321057100020316034803420743036200000570000303210571000403170319032a07430362000005700003032105710004057000030321057100040329072f020000000607430362000002000000000319032a0314072c0200000020074303680100000015556e73616665416c6c6f77616e63654368616e676503270200000000057000030321057100040317031705700002057000030317074303620000034c03210571000203190325072c02000000060320053e0362020000000203460570000303500342034c03160342053d036d03420200000044034c032105700002053d036d034c03210571000203170743036a000005700004031703160570000403160329072f02000000060743036200000200000000034d031b03420200000074072e0200000042034c032105700002053d036d034c03210571000203170743036a00000570000403160570000403160329072f02000000060743036200000200000000034d031b03420200000026034c032105700002053d036d034c03170743036a000005700003031703170317034d031b0342020000035e072e020000013c034c03210571000203170317031603480319033c072c02000000140743036801000000094f6e6c7941646d696e03270200000000032103160570000203210571000303160570000203210571000303170329072f0200000006074303620000020000000003120356072f020000003607430368010000002b43616e6e6f74206275726e206d6f7265207468616e207468652074617267657427732062616c616e63652e03270200000000034c032105710002031605700003032105710004031703170317031203110570000303210571000403170570000403160743036200000570000403210571000503190325072c020000000a057000030320053e03620200000006057000030346057000040317035003420321057100020317031703160342034c032105710002031703160342034c03160342053d036d03420200000216034c03210571000203170316057000020321057100030316057000020321057100030316034803190325072c0200000002034c02000000a903480570000303210571000403160342057000030321057100040317031705700003032105710004057000020321057100030329072f02000000060743036200000200000000034b0356072f020000001d0743036801000000124e6f74456e6f756768416c6c6f77616e636503270200000000057000030743036200000570000203210571000303190325072c0200000008034c0320053e03620200000004034c03460570000203500570000203210571000303170317057000020321057100030570000403210571000503160329072f02000000060743036200000200000000034b0356072f020000001b0743036801000000104e6f74456e6f75676842616c616e636503270200000000057000020743036200000570000203210571000303190325072c0200000008034c0320053e03620200000004034c034605700003032105710004031603500570000203210571000303170317034c03210571000205700004032105710005031703160329072f020000000607430362000002000000000312034c0743036200000570000203210571000303190325072c0200000008034c0320053e03620200000004034c034605700003031703160350057000020317034c0342032103170317057000020342034c03160342053d036d0342"
diff --git a/src/proto_019_PtParisA/lib_protocol/main.ml b/src/proto_019_PtParisA/lib_protocol/main.ml
index 5583e2b9bac06fe6fa836655cfd4d908c434084d..1e632339828a5a41c2442666dd66f94f2c8cf911 100644
--- a/src/proto_019_PtParisA/lib_protocol/main.ml
+++ b/src/proto_019_PtParisA/lib_protocol/main.ml
@@ -223,7 +223,6 @@ let prepare_ctxt ctxt mode ~(predecessor : Block_header.shell_header) =
     | Partial_construction _ ->
         init_consensus_rights_for_mempool ctxt ~predecessor_level
   in
-  let* ctxt = Dal_apply.initialisation ~level:predecessor_level ctxt in
   return
     ( ctxt,
       migration_balance_updates,
@@ -481,4 +480,4 @@ module Mempool = struct
          ~predecessor_hash:head_hash)
 end
 
-(* Vanity nonce: 1907250713889696 *)
+(* Vanity nonce: 5417469600518139 *)
diff --git a/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.ml b/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.ml
index a30dd1bc94811af630b56ad4d74758ee68dd0a14..f61b6e633a703de78b62372157b582f007de0e9a 100644
--- a/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.ml
@@ -36,6 +36,8 @@ type per_block_votes = {
   adaptive_issuance_vote : per_block_vote;
 }
 
+let ema_max = 2_000_000_000l
+
 let per_block_vote_compact_encoding =
   let open Data_encoding in
   let open Compact in
@@ -93,7 +95,7 @@ let per_block_votes_encoding =
 module Liquidity_baking_toggle_EMA = Votes_EMA_repr.Make (struct
   let baker_contribution = Z.of_int 500_000
 
-  let ema_max = 2_000_000_000l
+  let ema_max = ema_max
 end)
 
 module Adaptive_issuance_launch_EMA = Votes_EMA_repr.Make (struct
@@ -111,7 +113,7 @@ module Adaptive_issuance_launch_EMA = Votes_EMA_repr.Make (struct
      blocks are actually needed. *)
   let baker_contribution = Z.of_int 5730
 
-  let ema_max = 2_000_000_000l
+  let ema_max = ema_max
 end)
 
 let compute_new_liquidity_baking_ema ~per_block_vote ema =
@@ -125,3 +127,7 @@ let compute_new_adaptive_issuance_ema ~per_block_vote ema =
   | Per_block_vote_pass -> ema
   | Per_block_vote_off -> Adaptive_issuance_launch_EMA.update_ema_down ema
   | Per_block_vote_on -> Adaptive_issuance_launch_EMA.update_ema_up ema
+
+module Internal_for_tests = struct
+  let ema_max = ema_max
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.mli b/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.mli
index 6b026bf85f7fcc88281990155570e7f05e713908..abaa67352d9b4c5445757822df760b9b05a05010 100644
--- a/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/per_block_votes_repr.mli
@@ -81,3 +81,8 @@ val compute_new_adaptive_issuance_ema :
   per_block_vote:per_block_vote ->
   Adaptive_issuance_launch_EMA.t ->
   Adaptive_issuance_launch_EMA.t
+
+module Internal_for_tests : sig
+  (* Maximum value for EMA representation (both LB and AI) *)
+  val ema_max : Int32.t
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/raw_context.ml b/src/proto_019_PtParisA/lib_protocol/raw_context.ml
index 2b3c234b16ac8c735f52c03ae095f6f9e9c84ef6..9ccc46907926b0d73662dc9ba0b40a8ce915f452 100644
--- a/src/proto_019_PtParisA/lib_protocol/raw_context.ml
+++ b/src/proto_019_PtParisA/lib_protocol/raw_context.ml
@@ -87,18 +87,19 @@ module Raw_consensus = struct
   type t = {
     current_attestation_power : int;
         (** Number of attestation slots recorded for the current block. *)
-    allowed_attestations : (consensus_pk * int) Slot_repr.Map.t option;
-        (** Attestations rights for the current block. Only an attestation
-            for the lowest slot in the block can be recorded. The map
-            associates to each initial slot the [pkh] associated to this
-            slot with its power. This is [None] only in mempool mode. *)
-    allowed_preattestations : (consensus_pk * int) Slot_repr.Map.t option;
+    allowed_attestations : (consensus_pk * int * int) Slot_repr.Map.t option;
+        (** Attestations rights for the current block. Only an attestation for
+            the lowest slot in the block can be recorded. The map associates to
+            each initial slot the [pkh] associated to this slot with its
+            consensus attestation power and DAL attestation power. This is
+            [None] only in mempool mode. *)
+    allowed_preattestations : (consensus_pk * int * int) Slot_repr.Map.t option;
         (** Preattestations rights for the current block. Only a preattestation
-            for the lowest slot in the block can be recorded. The map
-            associates to each initial slot the [pkh] associated to this
-            slot with its power. This is [None] only in mempool mode, or in
-            application mode when there is no locked round (so the block
-            cannot contain any preattestations). *)
+            for the lowest slot in the block can be recorded. The map associates
+            to each initial slot the [pkh] associated to this slot with its
+            consensus attestation power and DAL attestation power. This is
+            [None] only in mempool mode, or in application mode when there is no
+            locked round (so the block cannot contain any preattestations). *)
     forbidden_delegates : Signature.Public_key_hash.Set.t;
         (** Delegates that are not allowed to bake or attest blocks; i.e.,
             delegates which have zero frozen deposit due to a previous
@@ -222,18 +223,6 @@ module Raw_consensus = struct
     {t with attestation_branch = Some attestation_branch}
 end
 
-type dal_committee = {
-  pkh_to_shards :
-    (Dal_attestation_repr.shard_index * int) Signature.Public_key_hash.Map.t;
-  shard_to_pkh : Signature.Public_key_hash.t Dal_attestation_repr.Shard_map.t;
-}
-
-let empty_dal_committee =
-  {
-    pkh_to_shards = Signature.Public_key_hash.Map.empty;
-    shard_to_pkh = Dal_attestation_repr.Shard_map.empty;
-  }
-
 type back = {
   context : Context.t;
   constants : Constants_parametric_repr.t;
@@ -272,7 +261,6 @@ type back = {
          - We need to provide an incentive to avoid byzantines to post
      dummy slot headers. *)
   dal_attestation_slot_accountability : Dal_attestation_repr.Accountability.t;
-  dal_committee : dal_committee;
   dal_cryptobox : Dal.t option;
   adaptive_issuance_enable : bool;
 }
@@ -886,8 +874,8 @@ let prepare ~level ~predecessor_timestamp ~timestamp ~adaptive_issuance_enable
             ~length:constants.Constants_parametric_repr.dal.number_of_slots;
         dal_attestation_slot_accountability =
           Dal_attestation_repr.Accountability.init
-            ~length:constants.Constants_parametric_repr.dal.number_of_slots;
-        dal_committee = empty_dal_committee;
+            ~number_of_slots:
+              constants.Constants_parametric_repr.dal.number_of_slots;
         dal_cryptobox = None;
         adaptive_issuance_enable;
       };
@@ -1035,10 +1023,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 =
@@ -1046,9 +1034,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
@@ -1676,9 +1664,9 @@ module type CONSENSUS = sig
 
   type consensus_pk
 
-  val allowed_attestations : t -> (consensus_pk * int) slot_map option
+  val allowed_attestations : t -> (consensus_pk * int * int) slot_map option
 
-  val allowed_preattestations : t -> (consensus_pk * int) slot_map option
+  val allowed_preattestations : t -> (consensus_pk * int * int) slot_map option
 
   val forbidden_delegates : t -> Signature.Public_key_hash.Set.t
 
@@ -1688,8 +1676,8 @@ module type CONSENSUS = sig
 
   val initialize_consensus_operation :
     t ->
-    allowed_attestations:(consensus_pk * int) slot_map option ->
-    allowed_preattestations:(consensus_pk * int) slot_map option ->
+    allowed_attestations:(consensus_pk * int * int) slot_map option ->
+    allowed_preattestations:(consensus_pk * int * int) slot_map option ->
     t
 
   val record_attestation : t -> initial_slot:slot -> power:int -> t tzresult
@@ -1833,12 +1821,15 @@ module Dal = struct
 
   let number_of_slots ctxt = ctxt.back.constants.dal.number_of_slots
 
-  let record_attested_shards ctxt attestation shards =
+  let number_of_shards ctxt =
+    ctxt.back.constants.dal.cryptobox_parameters.number_of_shards
+
+  let record_number_of_attested_shards ctxt attestation number =
     let dal_attestation_slot_accountability =
-      Dal_attestation_repr.Accountability.record_attested_shards
+      Dal_attestation_repr.Accountability.record_number_of_attested_shards
         ctxt.back.dal_attestation_slot_accountability
         attestation
-        shards
+        number
     in
     {ctxt with back = {ctxt.back with dal_attestation_slot_accountability}}
 
@@ -1877,108 +1868,6 @@ module Dal = struct
       ctxt.back.dal_attestation_slot_accountability
       ~threshold
       ~number_of_shards
-
-  type committee = dal_committee = {
-    pkh_to_shards :
-      (Dal_attestation_repr.shard_index * int) Signature.Public_key_hash.Map.t;
-    shard_to_pkh : Signature.Public_key_hash.t Dal_attestation_repr.Shard_map.t;
-  }
-
-  (* DAL/FIXME https://gitlab.com/tezos/tezos/-/issues/3110
-
-     A committee is selected by the callback function
-     [pkh_from_tenderbake_slot]. We use a callback because of circular
-     dependencies. It is not clear whether it will be the final choice
-     for the DAL committee. The current solution is a bit hackish but
-     should work. If we decide to differ from the Tenderbake
-     committee, one could just draw a new committee.
-
-     The problem with drawing a new committee is that it is not
-     guaranteed that everyone in the DAL committee will be in the
-     Tenderbake committee. Consequently, either we decide to have a
-     new consensus operation which does not count for Tenderbake,
-     and/or we take into account for the model of DAL that at every
-     level, a percentage of DAL attestations cannot be received. *)
-  let compute_committee ctxt pkh_from_tenderbake_slot =
-    let open Lwt_result_syntax in
-    let Constants_parametric_repr.
-          {
-            dal = {cryptobox_parameters = {number_of_shards; _}; _};
-            consensus_committee_size;
-            _;
-          } =
-      ctxt.back.constants
-    in
-    (* We first draw a committee by drawing slots from the Tenderbake
-       committee. To have a compact representation of slots, we can
-       sort the Tenderbake slots by [pkh], so that a committee is
-       actually only an interval. This is done by recomputing a
-       committee from the first one. *)
-    let update_committee committee pkh ~slot_index ~power =
-      {
-        pkh_to_shards =
-          Signature.Public_key_hash.Map.update
-            pkh
-            (function
-              | None -> Some (slot_index, power)
-              | Some (initial_shard_index, old_power) ->
-                  Some (initial_shard_index, old_power + power))
-            committee.pkh_to_shards;
-        shard_to_pkh =
-          List.fold_left
-            (fun shard_to_pkh slot ->
-              Dal_attestation_repr.Shard_map.add slot pkh shard_to_pkh)
-            committee.shard_to_pkh
-            Misc.(slot_index --> (slot_index + (power - 1)));
-      }
-    in
-    let rec compute_power index committee =
-      if Compare.Int.(index < 0) then return committee
-      else
-        let shard_index = index mod consensus_committee_size in
-        let*? slot = Slot_repr.of_int shard_index in
-        let* _ctxt, pkh = pkh_from_tenderbake_slot slot in
-        (* The [Slot_repr] module is related to the Tenderbake committee. *)
-        let slot_index = Slot_repr.to_int slot in
-        (* An optimisation could be to return only [pkh_to_shards] map
-           because the second one is not used. This can be done later
-           on, if it is a good optimisation. *)
-        let committee = update_committee committee pkh ~slot_index ~power:1 in
-        compute_power (index - 1) committee
-    in
-    (* This committee is an intermediate to compute the final DAL
-       committee. This one only projects the Tenderbake committee into
-       the DAL committee. The next one reorders the slots so that they
-       are grouped by public key hash. *)
-    let* unordered_committee =
-      compute_power (number_of_shards - 1) empty_dal_committee
-    in
-    let dal_committee =
-      Signature.Public_key_hash.Map.fold
-        (fun pkh (_, power) (total_power, committee) ->
-          let committee =
-            update_committee committee pkh ~slot_index:total_power ~power
-          in
-          let new_total_power = total_power + power in
-          (new_total_power, committee))
-        unordered_committee.pkh_to_shards
-        (0, empty_dal_committee)
-      |> snd
-    in
-    return dal_committee
-
-  let init_committee ctxt committee =
-    {ctxt with back = {ctxt.back with dal_committee = committee}}
-
-  let shards_of_attester ctxt ~attester:pkh =
-    let rec make acc (initial_shard_index, power) =
-      if Compare.Int.(power <= 0) then List.rev acc
-      else make (initial_shard_index :: acc) (initial_shard_index + 1, power - 1)
-    in
-    Signature.Public_key_hash.Map.find_opt
-      pkh
-      ctxt.back.dal_committee.pkh_to_shards
-    |> Option.map (fun pre_shards -> make [] pre_shards)
 end
 
 (* The type for relative context accesses instead from the root. In order for
diff --git a/src/proto_019_PtParisA/lib_protocol/raw_context.mli b/src/proto_019_PtParisA/lib_protocol/raw_context.mli
index 76a39cc234385210af5d31ad82eea384a05591ac..8ce1fbe2de0437ec2792f5037ff085ba1642b9f9 100644
--- a/src/proto_019_PtParisA/lib_protocol/raw_context.mli
+++ b/src/proto_019_PtParisA/lib_protocol/raw_context.mli
@@ -328,15 +328,13 @@ module type CONSENSUS = sig
 
   type consensus_pk
 
-  (** Returns a map where each attester's pkh is associated to the
-     list of its attesting slots (in decreasing order) for a given
-     level. *)
-  val allowed_attestations : t -> (consensus_pk * int) slot_map option
+  (** Returns a map where from the initial slot of each attester in the TB
+      committee for a given level, to the attester's public key and its
+      consensus power and DAL power. *)
+  val allowed_attestations : t -> (consensus_pk * int * int) slot_map option
 
-  (** Returns a map where each attester's pkh is associated to the
-     list of its attesting slots (in decreasing order) for a given
-     level. *)
-  val allowed_preattestations : t -> (consensus_pk * int) slot_map option
+  (** See {!allowed_attestations}. *)
+  val allowed_preattestations : t -> (consensus_pk * int * int) slot_map option
 
   (** Returns the set of delegates that are not allowed to bake or
       attest blocks; i.e., delegates which have zero frozen deposit
@@ -355,8 +353,8 @@ module type CONSENSUS = sig
       operation. *)
   val initialize_consensus_operation :
     t ->
-    allowed_attestations:(consensus_pk * int) slot_map option ->
-    allowed_preattestations:(consensus_pk * int) slot_map option ->
+    allowed_attestations:(consensus_pk * int * int) slot_map option ->
+    allowed_preattestations:(consensus_pk * int * int) slot_map option ->
     t
 
   (** [record_attestation ctx ~initial_slot ~power] records an
@@ -433,12 +431,12 @@ module Dal : sig
 
   val number_of_slots : t -> int
 
-  (** [record_attested_shards ctxt attestation shards] records that the
-     list of shards [shards] were attested (declared available by some
-     attester). The function assumes that a shard belongs to the
-     interval [0; number_of_shards - 1]. Otherwise, for each shard
-     outside this interval, it is a no-op. *)
-  val record_attested_shards : t -> Dal_attestation_repr.t -> int list -> t
+  val number_of_shards : t -> int
+
+  (** [record_number_of_attested_shards ctxt attestation number_of_shards]
+      records that the [number_of_shards] shards were attested (declared
+      available by some attester). *)
+  val record_number_of_attested_shards : t -> Dal_attestation_repr.t -> int -> t
 
   (** [register_slot_header ctxt slot_header] returns a new context
      where the new candidate [slot] have been taken into
@@ -457,59 +455,4 @@ module Dal : sig
      otherwise. If the [index] is out of the interval
      [0;number_of_slots - 1], returns [false]. *)
   val is_slot_index_attested : t -> Dal_slot_index_repr.t -> bool
-
-  (** [shards_of_attester ctxt ~attester] returns the shard assignment
-     of the DAL committee of the current level for [attester]. This
-     function never returns an empty list. *)
-  val shards_of_attester :
-    t -> attester:Signature.Public_key_hash.t -> int list option
-
-  (** The DAL committee is a subset of the Tenderbake committee.  A
-     shard from [0;number_of_shards] is associated to a public key
-     hash. For efficiency reasons, the committee is both:
-     a mapping from public key hashes to shards and
-     a mapping from shards to public key hashes.
-     The DAL committee ensures the shards associated to the
-     same public key hash are contiguous. The list of shards is
-     represented as two natural numbers [(initial, power)] which
-     encodes the list of shards:
-     [initial; initial + 1; ... ; initial + power - 1].
-
-      This data-type ensures the following invariants:
-
-      - \forall pkh shard, find pkh_to_shards pkh = Some (start,n) ->
-     \forall i, i \in [start; start + n - 1] -> find shard_to_pkh i
-     = Some pkh
-
-      - forall pkh shard, find shard_to_pkh shard = Some pkh ->
-     \exists (start,n), find pkh_to_shards pkh = Some (start,n) /\
-     start <= shard <= start + n - 1
-
-      - Given an attester, all its shard assignments are contiguous
-     *)
-  type committee = {
-    pkh_to_shards :
-      (Dal_attestation_repr.shard_index * int) Signature.Public_key_hash.Map.t;
-    shard_to_pkh : Signature.Public_key_hash.t Dal_attestation_repr.Shard_map.t;
-  }
-
-  (** [compute_committee ctxt pkh_from_tenderbake_slot] computes the
-     DAL committee using the [pkh_from_tenderbake_slot] function. This
-     functions takes into account the fact that the DAL committee and
-     the Tenderbake committee may have different sizes. If the DAL
-     committee is smaller, then we simply take a projection of the
-     Tenderbake committee for the first [n] slots. If the DAL
-     committee is larger, shards are computed modulo the Tenderbake
-     committee. Slots assignments are reordered for a given a public
-     key hash to ensure all the slots (or shards in the context of
-     DAL) shards are contiguous (see {!type:committee}). *)
-  val compute_committee :
-    t ->
-    (Slot_repr.t -> (t * Signature.Public_key_hash.t) tzresult Lwt.t) ->
-    committee tzresult Lwt.t
-
-  (** [init_committee ctxt committee] returns a context where the
-     [committee] is cached. The committee is expected to be the one
-     for the current level. *)
-  val init_committee : t -> committee -> t
 end
diff --git a/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml b/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml
index 051a955f5ca12052efbeef74762f9f9035ac3d52..909b39762ec50df52a4295551f5798dfd6a8448f 100644
--- a/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.ml
@@ -1,24 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic Labs                 *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.mli b/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.mli
index 3846e5364d672646684654736c85f41bafd6525d..9ef2a237d0f77fc390522de651f543acb272077f 100644
--- a/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.mli
+++ b/src/proto_019_PtParisA/lib_protocol/sc_rollup_inbox_merkelized_payload_hashes_repr.mli
@@ -1,24 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic Labs                 *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/shared_stake.ml b/src/proto_019_PtParisA/lib_protocol/shared_stake.ml
index 5164e4a391df5380f7acda7310ba60b3c149a332..60b5888f9354df553a33805142612740bb874889 100644
--- a/src/proto_019_PtParisA/lib_protocol/shared_stake.ml
+++ b/src/proto_019_PtParisA/lib_protocol/shared_stake.ml
@@ -145,7 +145,7 @@ let pay_rewards ctxt ?active_stake ~source ~delegate rewards =
     Token.transfer
       ctxt
       source
-      (`Frozen_deposits (Frozen_staker_repr.baker delegate))
+      (`Frozen_deposits (Frozen_staker_repr.baker_edge delegate))
       to_baker_from_edge_over_stakers
   in
   let* ctxt, balance_updates_frozen_rewards_stakers =
diff --git a/src/proto_019_PtParisA/lib_protocol/slash_percentage.ml b/src/proto_019_PtParisA/lib_protocol/slash_percentage.ml
index 68c9f28c94aa4bdc4ec9861f03da68852f31b7d6..83e31903dab769c23f16b23666c9bbb71696ea87 100644
--- a/src/proto_019_PtParisA/lib_protocol/slash_percentage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/slash_percentage.ml
@@ -44,3 +44,7 @@ let get ctxt ~(kind : Misbehaviour_repr.kind) ~(level : Level_repr.t)
   | Double_attesting | Double_preattesting ->
       let* ctxt, rights = Delegate_sampler.attesting_rights_count ctxt level in
       return (ctxt, for_double_attestation ctxt rights denounced)
+
+module Internal_for_tests = struct
+  let for_double_attestation = for_double_attestation
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/slash_percentage.mli b/src/proto_019_PtParisA/lib_protocol/slash_percentage.mli
index 2f8a71eca8519c6fa8e700ce7cd46561f7559943..3a557576f44ccd3ce39ab855c858c78e9479cc4b 100644
--- a/src/proto_019_PtParisA/lib_protocol/slash_percentage.mli
+++ b/src/proto_019_PtParisA/lib_protocol/slash_percentage.mli
@@ -20,3 +20,11 @@ val get :
   level:Level_repr.t ->
   Signature.public_key_hash list ->
   (Raw_context.t * Percentage.t) tzresult Lwt.t
+
+module Internal_for_tests : sig
+  val for_double_attestation :
+    Raw_context.t ->
+    int Signature.Public_key_hash.Map.t ->
+    Signature.Public_key_hash.t list ->
+    Percentage.t
+end
diff --git a/src/proto_019_PtParisA/lib_protocol/stake_storage.ml b/src/proto_019_PtParisA/lib_protocol/stake_storage.ml
index 712a1aedf77059619ad99e6cf988e7220f3bc530..53ad57c4fe74e8f6917a5c321b1f0f7b2d1aacf5 100644
--- a/src/proto_019_PtParisA/lib_protocol/stake_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/stake_storage.ml
@@ -92,13 +92,13 @@ let has_minimal_stake ctxt staking_balance =
 
 let initialize_delegate ctxt delegate ~delegated =
   let open Lwt_result_syntax in
-  let current_cycle = (Raw_context.current_level ctxt).cycle in
+  let current_level = Raw_context.current_level ctxt in
   let balance =
     Full_staking_balance_repr.init
       ~own_frozen:Tez_repr.zero
       ~staked_frozen:Tez_repr.zero
       ~delegated
-      ~current_cycle
+      ~current_level
   in
   let* ctxt = Storage.Stake.Staking_balance.init ctxt delegate balance in
   if has_minimal_stake ctxt balance then
@@ -150,8 +150,8 @@ let update_stake ~f ctxt delegate =
   | false, false | true, true -> return ctxt
 
 let remove_delegated_stake ctxt delegate amount =
-  let current_cycle = (Raw_context.current_level ctxt).cycle in
-  let f = Full_staking_balance_repr.remove_delegated ~current_cycle ~amount in
+  let current_level = Raw_context.current_level ctxt in
+  let f = Full_staking_balance_repr.remove_delegated ~current_level ~amount in
   update_stake ctxt delegate ~f
 
 let remove_own_frozen_stake ctxt delegate amount =
@@ -166,12 +166,16 @@ let remove_frozen_stake_only_call_from_token ctxt staker amount =
   match staker with
   | Frozen_staker_repr.Baker delegate ->
       remove_own_frozen_stake ctxt delegate amount
+  | Frozen_staker_repr.Baker_edge delegate ->
+      (* This case should not happen because [Baker_edge] is only
+         intended to be used for rewards. *)
+      remove_own_frozen_stake ctxt delegate amount
   | Single_staker {staker = _; delegate} | Shared_between_stakers {delegate} ->
       remove_staked_frozen_stake ctxt delegate amount
 
 let add_delegated_stake ctxt delegate amount =
-  let current_cycle = (Raw_context.current_level ctxt).cycle in
-  let f = Full_staking_balance_repr.add_delegated ~current_cycle ~amount in
+  let current_level = Raw_context.current_level ctxt in
+  let f = Full_staking_balance_repr.add_delegated ~current_level ~amount in
   update_stake ctxt delegate ~f
 
 let add_own_frozen_stake ctxt delegate amount =
@@ -186,6 +190,8 @@ let add_frozen_stake_only_call_from_token ctxt staker amount =
   match staker with
   | Frozen_staker_repr.Baker delegate ->
       add_own_frozen_stake ctxt delegate amount
+  | Frozen_staker_repr.Baker_edge delegate ->
+      add_own_frozen_stake ctxt delegate amount
   | Single_staker {staker = _; delegate} | Shared_between_stakers {delegate} ->
       add_staked_frozen_stake ctxt delegate amount
 
diff --git a/src/proto_019_PtParisA/lib_protocol/staking.ml b/src/proto_019_PtParisA/lib_protocol/staking.ml
index 7d66398ce24fdedcfc031383c189b9ee03f988ce..6b7fce09b3e4b8a9489284d7815de97b280a4b2d 100644
--- a/src/proto_019_PtParisA/lib_protocol/staking.ml
+++ b/src/proto_019_PtParisA/lib_protocol/staking.ml
@@ -131,12 +131,21 @@ let finalize_unstake ctxt ~for_next_cycle_use_only_after_slashing contract =
 let can_stake_from_unstake ctxt ~for_next_cycle_use_only_after_slashing
     ~delegate =
   let open Lwt_result_syntax in
-  let* slashing_history_opt =
-    Storage.Contract.Slashed_deposits.find
+  let* slashing_history_opt = Storage.Slashed_deposits.find ctxt delegate in
+  let slashing_history = Option.value slashing_history_opt ~default:[] in
+
+  let* slashing_history_opt_o =
+    Storage.Contract.Slashed_deposits__Oxford.find
       ctxt
       (Contract_repr.Implicit delegate)
   in
-  let slashing_history = Option.value slashing_history_opt ~default:[] in
+  let slashing_history_o =
+    Option.value slashing_history_opt_o ~default:[]
+    |> List.map (fun (a, b) -> (a, Percentage.convert_from_o_to_p b))
+  in
+
+  let slashing_history = slashing_history @ slashing_history_o in
+
   let current_cycle = (Raw_context.current_level ctxt).cycle in
   let current_cycle =
     if for_next_cycle_use_only_after_slashing then Cycle_repr.succ current_cycle
diff --git a/src/proto_019_PtParisA/lib_protocol/storage.ml b/src/proto_019_PtParisA/lib_protocol/storage.ml
index 340498959323cb4c3f6f5df5f9b7b6163d1a6850..ad2b76ee94cb3fa5c32e6721c914a5921e72d6da 100644
--- a/src/proto_019_PtParisA/lib_protocol/storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/storage.ml
@@ -153,6 +153,7 @@ module Missed_attestations_info = struct
       (obj2 (req "remaining_slots" int31) (req "missed_levels" int31))
 end
 
+(* TODO #6918: move closer to its only use left after P *)
 module Slashed_deposits_history = struct
   type slashed_percentage = Percentage.t
 
@@ -487,15 +488,6 @@ module Contract = struct
       end)
       (Tez_repr)
 
-  (* TODO #6918: change name back after P *)
-  module Slashed_deposits =
-    Indexed_context.Make_map
-      (Registered)
-      (struct
-        let name = ["slashed_deposits_p"]
-      end)
-      (Slashed_deposits_history)
-
   (* TODO #6918: Remove after P *)
   module Slashed_deposits__Oxford =
     Indexed_context.Make_map
@@ -1110,6 +1102,15 @@ module Pending_denunciations =
        (Public_key_hash_index)
     (Denunciations_repr)
 
+module Slashed_deposits =
+  Make_indexed_data_storage
+    (Make_subcontext (Registered) (Raw_context)
+       (struct
+         let name = ["slashed_deposits"]
+       end))
+       (Public_key_hash_index)
+    (Slashed_deposits_history)
+
 (** Per cycle storage *)
 
 (* TODO #6957: Remove this from protocol Q. *)
diff --git a/src/proto_019_PtParisA/lib_protocol/storage.mli b/src/proto_019_PtParisA/lib_protocol/storage.mli
index 6b3767147498f2d8746829abe77200dee0fe0727..2b905fcce5e4546a4b1fe72fba0f986c9d756ffc 100644
--- a/src/proto_019_PtParisA/lib_protocol/storage.mli
+++ b/src/proto_019_PtParisA/lib_protocol/storage.mli
@@ -264,29 +264,6 @@ module Contract : sig
        and type value = Z.t
        and type t := Raw_context.t
 
-  (** History of slashed deposits: an associative list of cycles to slashed
-      percentages.
-
-      This storage is inefficient but is not expected to grow large (as of
-      2023-11-28, the last slashing on mainnet dates back to:
-      - 2021-12-17 for double baking (154 events in total),
-      - 2019-08-08 for double endorsing (24 events in total).
-      Since slashings are here grouped by baker and cycle, there would only be
-      a few elements in each list.
-
-      The slashing percentages are used to compute the real value of stake
-      withdrawals.
-      Currently there is no limit to the age of the events we need to store
-      because there is no such limit for stake withdrawals.
-      At worst we can revisit this decision in a later protocol amendment (in
-      25 cycles) or clean up this storage manually or automatically.
-  *)
-  module Slashed_deposits :
-    Indexed_data_storage
-      with type key = Contract_repr.t
-       and type value = Slashed_deposits_history.t
-       and type t := Raw_context.t
-
   (* TODO #6918: Remove after P *)
   module Slashed_deposits__Oxford :
     Indexed_data_storage
@@ -485,6 +462,28 @@ module Pending_denunciations :
      and type key = Signature.public_key_hash
      and type value = Denunciations_repr.t
 
+(** History of slashed deposits: an associative list of cycles to slashed
+    percentages.
+
+    This storage is inefficient but is not expected to grow large (as of
+    2023-11-28, the last slashing on mainnet dates back to:
+    - 2021-12-17 for double baking (154 events in total),
+    - 2019-08-08 for double endorsing (24 events in total).
+    Since slashings are here grouped by baker and cycle, there would only be
+    a few elements in each list.
+
+    The slashing percentages are used to compute the real value of stake
+    withdrawals.
+    Currently there is no limit to the age of the events we need to store
+    because there is no such limit for stake withdrawals.
+    At worst we can revisit this decision in a later protocol amendment (in
+    25 cycles) or clean up this storage manually or automatically. *)
+module Slashed_deposits :
+  Indexed_data_storage
+    with type t := Raw_context.t
+     and type key = Signature.public_key_hash
+     and type value = Slashed_deposits_history.t
+
 (** Needed for the stitching from Oxford to P.
     TODO #6957: Remove this from protocol Q. *)
 type denounced__Oxford = {for_double_attesting : bool; for_double_baking : bool}
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/context.ml b/src/proto_019_PtParisA/lib_protocol/test/helpers/context.ml
index a70eb1343e9c7ea6c04825e788d5679768a6fe8a..ada9c3bb62e665ce64eef1d1f320262be14c4165 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/context.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/context.ml
@@ -487,7 +487,7 @@ module Delegate = struct
     frozen_deposits_limit : Tez.t option;
     delegated_contracts : Alpha_context.Contract.t list;
     delegated_balance : Tez.t;
-    min_delegated_in_current_cycle : Tez.t;
+    min_delegated_in_current_cycle : Tez.t * Level_repr.t option;
     total_delegated_stake : Tez.t;
     staking_denominator : Staking_pseudotoken.t;
     deactivated : bool;
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/context.mli b/src/proto_019_PtParisA/lib_protocol/test/helpers/context.mli
index 05737069baf78d1b74c3f890445426dd5cdd0389..c6593218e140dba410168db0cafcdcfc89e6ba49 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/context.mli
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/context.mli
@@ -199,8 +199,9 @@ module Dal : sig
   val shards :
     t ->
     ?level:Raw_level.t ->
+    ?delegates:Signature.public_key_hash list ->
     unit ->
-    (Signature.Public_key_hash.t * (int * int)) list tzresult Lwt.t
+    Plugin.RPC.Dal.S.shards_output tzresult Lwt.t
 end
 
 module Contract : sig
@@ -256,7 +257,7 @@ module Delegate : sig
     frozen_deposits_limit : Tez.t option;
     delegated_contracts : Alpha_context.Contract.t list;
     delegated_balance : Tez.t;
-    min_delegated_in_current_cycle : Tez.t;
+    min_delegated_in_current_cycle : Tez.t * Level_repr.t option;
     total_delegated_stake : Tez.t;
     staking_denominator : Staking_pseudotoken.t;
     deactivated : bool;
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/nonce.ml b/src/proto_019_PtParisA/lib_protocol/test/helpers/nonce.ml
index 23edb62e017f4bb8449c5d3b8ed80fa1b9b5f769..8edff69913958449a9d5b65c05ec2d073addc379 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/nonce.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/nonce.ml
@@ -1,11 +1,9 @@
-(**************************************************************************)
-(*                                                                        *)
-(*    Copyright (c) 2014 - 2018.                                          *)
-(*    Dynamic Ledger Solutions, Inc.< contact@tezos.com >                 *)
-(*                                                                        *)
-(*    All rights reserved.No warranty, explicit or implicit, provided.    *)
-(*                                                                        *)
-(**************************************************************************)
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2014-2018 Dynamic Ledger Solutions, Inc. *)
+(*                                                                           *)
+(*****************************************************************************)
 
 open Protocol
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.ml b/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.ml
index 6a7745859af01c1c49a96880b7b16dbf92bd2405..b5a21d8219aa3723aded617c639b7b3bcf2a5d77 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.ml
@@ -1,25 +1,9 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
+(* SPDX-License-Identifier: MIT                                              *)
 (* Copyright (c) 2021 Trili Tech,                        *)
 (*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*****************************************************************************)
 
 let update k v m ctxt = Protocol.Script_big_map.update ctxt k v m
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.mli b/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.mli
index 0a6bcc4d51ade0f8ba124118e20258f77fbf9577..f87ffc7733956eb18c898804b84c32d6f6ccb595 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.mli
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/script_big_map.mli
@@ -1,25 +1,9 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
+(* SPDX-License-Identifier: MIT                                              *)
 (* Copyright (c) 2021 Trili Tech,                        *)
 (*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*****************************************************************************)
 
 (** Update a big map. See [Script_typed_ir.big_map_get_and_update] for details. *)
 val update :
diff --git a/src/proto_019_PtParisA/lib_protocol/test/helpers/ticket_helpers.ml b/src/proto_019_PtParisA/lib_protocol/test/helpers/ticket_helpers.ml
index 4e9195a59280cb25b900deb71588ab817d4682a8..f3fe9ad5805ed923a6fea3e4524b68e3cc77ecf7 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/helpers/ticket_helpers.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/helpers/ticket_helpers.ml
@@ -1,25 +1,9 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
+(* SPDX-License-Identifier: MIT                                              *)
 (* Copyright (c) 2022 Trili Tech,                        *)
 (*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*****************************************************************************)
 
 open Protocol
 open Alpha_context
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/consensus/test_attestation.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/consensus/test_attestation.ml
index dc30e0530cb9054d2f5cde35f72542a869f85167..27d78248e1226e329cfebe66320d555b5f31503a 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/consensus/test_attestation.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/consensus/test_attestation.ml
@@ -726,7 +726,10 @@ let test_attester_not_in_dal_committee () =
         committee
     in
     let in_dal_committee =
-      List.mem_assoc ~equal:Signature.Public_key_hash.equal pkh dal_committee
+      List.exists
+        (fun ({delegate; _} : Plugin.RPC.Dal.S.shards_assignment) ->
+          Signature.Public_key_hash.equal pkh delegate)
+        dal_committee
     in
     if in_committee && not in_dal_committee then
       let dal_content = {attestation = Dal.Attestation.empty} in
@@ -737,7 +740,7 @@ let test_attester_not_in_dal_committee () =
             Environment.Ecoproto_error
               (Alpha_context.Dal_errors
                .Dal_data_availibility_attester_not_in_committee
-                {attester; level});
+                {attester; level; slot = _});
           ]
           when Signature.Public_key_hash.equal attester pkh
                && Raw_level.to_int32 level = b.header.shell.level ->
@@ -761,6 +764,66 @@ let test_attester_not_in_dal_committee () =
   let* _ = iter b 0 in
   return_unit
 
+let test_dal_attestation_threshold () =
+  let open Lwt_result_wrap_syntax in
+  let n = 100 in
+  let* genesis, contracts = Context.init_n n ~consensus_threshold:0 () in
+  let contract = Stdlib.List.hd contracts in
+  let* {
+         parametric =
+           {
+             dal =
+               {
+                 attestation_lag;
+                 attestation_threshold;
+                 cryptobox_parameters = {number_of_shards; _};
+                 _;
+               };
+             _;
+           };
+         _;
+       } =
+    Context.get_constants (B genesis)
+  in
+  let slot_index = Dal.Slot_index.zero in
+  let commitment = Alpha_context.Dal.Slot.Commitment.zero in
+  let commitment_proof = Alpha_context.Dal.Slot.Commitment_proof.zero in
+  let slot_header =
+    Dal.Operations.Publish_commitment.{slot_index; commitment; commitment_proof}
+  in
+  let* op = Op.dal_publish_commitment (B genesis) contract slot_header in
+  let* b = Block.bake genesis ~operation:op in
+  let* b = Block.bake_n (attestation_lag - 1) b in
+  let* dal_committee = Context.Dal.shards (B b) () in
+  let attestation = Dal.Attestation.commit Dal.Attestation.empty slot_index in
+  let dal_content = {attestation} in
+  let min_power = attestation_threshold * number_of_shards / 100 in
+  Log.info "Number of minimum required attested shards: %d" min_power ;
+  let* _ =
+    List.fold_left_es
+      (fun (acc_ops, acc_power)
+           ({delegate; indexes} : RPC.Dal.S.shards_assignment) ->
+        let* op = Op.attestation ~delegate ~dal_content b in
+        let ops = op :: acc_ops in
+        let power = acc_power + List.length indexes in
+        let* _b, (metadata, _ops) =
+          Block.bake_with_metadata ~operations:ops b
+        in
+        let attested_expected = power >= min_power in
+        let attested =
+          Dal.Attestation.is_attested metadata.dal_attestation slot_index
+        in
+        Log.info "With %d power, the slot is attested: %b " power attested ;
+        Check.(attested = attested_expected)
+          Check.bool
+          ~error_msg:
+            "Unexpected attestation status for slot 0: got %L, expected %R " ;
+        return (ops, power))
+      ([], 0)
+      dal_committee
+  in
+  return_unit
+
 let tests =
   [
     (* Positive tests *)
@@ -820,6 +883,10 @@ let tests =
       "attester not in DAL committee"
       `Quick
       test_attester_not_in_dal_committee;
+    Tztest.tztest
+      "DAL attestation_threshold"
+      `Quick
+      test_dal_attestation_threshold;
   ]
 
 let () =
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/operations/test_sc_rollup.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/operations/test_sc_rollup.ml
index 7b9cdbce6452cac2c22484fa31eee8c11daa4e68..abc356b1f36429cc9ef4ec9e02b275c0df48a7f4 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/operations/test_sc_rollup.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/operations/test_sc_rollup.ml
@@ -164,8 +164,8 @@ let bake_timeout_period ?timeout_period_in_blocks block =
     context and contracts. *)
 let context_init ?commitment_period_in_blocks
     ?(sc_rollup_challenge_window_in_blocks = 10)
-    ?sc_rollup_max_active_outbox_levels ?(timeout_period_in_blocks = 10)
-    ?hard_gas_limit_per_operation ?hard_gas_limit_per_block tup =
+    ?(timeout_period_in_blocks = 10) ?hard_gas_limit_per_operation
+    ?hard_gas_limit_per_block tup =
   Context.init_with_constants_gen
     tup
     {
@@ -185,12 +185,6 @@ let context_init ?commitment_period_in_blocks
           arith_pvm_enable = true;
           private_enable = true;
           challenge_window_in_blocks = sc_rollup_challenge_window_in_blocks;
-          max_active_outbox_levels =
-            Option.value
-              ~default:
-                Context.default_test_constants.sc_rollup
-                  .max_active_outbox_levels
-              sc_rollup_max_active_outbox_levels;
           commitment_period_in_blocks =
             Option.value
               ~default:
@@ -1585,11 +1579,7 @@ let test_invalid_output_proof () =
 
 let test_execute_message_override_applied_messages_slot () =
   let open Lwt_result_syntax in
-  (* Since we will create more blocks than the [max_active_outbox_levels]
-     parametric constant, we initialize it with a small enough value. *)
-  let* block, (baker, originator) =
-    context_init ~sc_rollup_max_active_outbox_levels:100l Context.T2
-  in
+  let* block, (baker, originator) = context_init Context.T2 in
   let baker = Context.Contract.pkh baker in
   (* Originate a rollup that accepts a list of string tickets as input. *)
   let* block, rollup =
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/test_adaptive_issuance_launch.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/test_adaptive_issuance_launch.ml
index c7691f1a12ec797a11bb8150a985bfa58f9e2b9f..5eeb35da6a884c439244ad2be43a2b331c410d5a 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/test_adaptive_issuance_launch.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/test_adaptive_issuance_launch.ml
@@ -123,6 +123,24 @@ let test_launch threshold expected_vote_duration () =
   (* Initialize the state with a single delegate. *)
   let constants =
     let default_constants = Default_parameters.constants_test in
+    let default_constants =
+      {
+        default_constants with
+        dal =
+          {
+            default_constants.dal with
+            cryptobox_parameters =
+              {
+                default_constants.dal.cryptobox_parameters with
+                (* Computing the DAL committee takes a bit of time, around 1ms
+                   for [number_of_shards] = 2048, and this adds up when baking
+                   for a long time. As this issue is orthogonal to this test, we
+                   simply pick a lower value. *)
+                number_of_shards = 32;
+              };
+          };
+      }
+    in
     let adaptive_issuance =
       {
         default_constants.adaptive_issuance with
@@ -402,6 +420,21 @@ let test_does_not_launch_without_feature_flag threshold vote_duration () =
   (* Initialize the state with a single delegate. *)
   let constants =
     let default_constants = Default_parameters.constants_test in
+    let default_constants =
+      {
+        default_constants with
+        dal =
+          {
+            default_constants.dal with
+            cryptobox_parameters =
+              {
+                default_constants.dal.cryptobox_parameters with
+                (* same reasoning as for [test_launch] *)
+                number_of_shards = 32;
+              };
+          };
+      }
+    in
     let adaptive_issuance =
       {
         default_constants.adaptive_issuance with
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/test_frozen_bonds.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/test_frozen_bonds.ml
index dadb2b784deefce5c3dcb29a59bd06140450fd0e..8114121e2d8560f0c8a18dd1db73d26ffd405b93 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/test_frozen_bonds.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/test_frozen_bonds.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic Labs            *)
-(*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/generators.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/generators.ml
index 59f2b10c3a9c68522b95188c199641831e5d356c..60f1659e74a4bb9311b308435bb84fb1cfc44efd 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/generators.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/generators.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/manager_operation_helpers.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/manager_operation_helpers.ml
index ff403efc03b943280cf53c8ff5cbc1dbe901db9f..3f0b2bd1da0972040978bc0e899039fba1a9c96a 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/manager_operation_helpers.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/manager_operation_helpers.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_1m_restriction.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_1m_restriction.ml
index fce8f981d20bf5ec75b15be74c5b700c1d680ba2..4b57c126b9c36399e47e209648277683b70bbe32 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_1m_restriction.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_1m_restriction.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_covalidity.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_covalidity.ml
index dbff94fffa3c1c6759a8f673541e0101e29c4345..c226eb6790594c64a3f22879dfb88de2297945bd 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_covalidity.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_covalidity.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_manager_operation_validation.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_manager_operation_validation.ml
index 607c8713c2cd58c30a18bab5467031bb4db162d5..c305de646dd6cb200ac8e27ab2a7770d89a3d78f 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_manager_operation_validation.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_manager_operation_validation.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_sanity.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_sanity.ml
index 5ff0d493684bb1db81587ce1cbcf001fe625fa43..18dc8481433bd5d1fe83495eafae79bb249ea3b1 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_sanity.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_sanity.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_validation_batch.ml b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_validation_batch.ml
index c48b0fb77498250200cd0490c97b6154e4364a88..ede4e68b1fb7443a0f35e94344e2b271e92f166d 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_validation_batch.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/integration/validate/test_validation_batch.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic-Labs.                *)
-(*                                                                           *)
-(* Permission  is hereby granted, free of charge, to any person obtaining a  *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/test/pbt/test_balance_updates_encoding.ml b/src/proto_019_PtParisA/lib_protocol/test/pbt/test_balance_updates_encoding.ml
index 0c7309e9d7479e00a5fc7e2c34dfaa67f76326cc..1603f4e5f03194f8dd23f331e1a3305f699b5c6a 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/pbt/test_balance_updates_encoding.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/pbt/test_balance_updates_encoding.ml
@@ -65,6 +65,7 @@ let frozen_staker =
       Frozen_staker_repr.single_staker
         ~staker:default_contract
         ~delegate:default_delegate;
+      Frozen_staker_repr.baker_edge default_delegate;
     ]
 
 let deposits =
diff --git a/src/proto_019_PtParisA/lib_protocol/test/pbt/test_dal_slot_proof.ml b/src/proto_019_PtParisA/lib_protocol/test/pbt/test_dal_slot_proof.ml
index 075dbdd1128f6891be5ccbe4092a97bd7e4cbcfa..423f62d07ad8eb843705da7f3f3eb946ca30d3a8 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/pbt/test_dal_slot_proof.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/pbt/test_dal_slot_proof.ml
@@ -208,11 +208,7 @@ struct
       QCheck2.Gen.(
         let nb_slots = 0 -- Parameters.(dal_parameters.number_of_slots) in
         let nb_levels = 4 -- 30 in
-        let* start_level =
-          let* n = small_nat in
-          return (n + 1)
-          (* skip level 0 by adding 1 *)
-        in
+        let* start_level = small_nat in
         (* The slot is confirmed iff the boolean is true *)
         let slot = bool in
         let slots = list_size nb_slots slot in
diff --git a/src/proto_019_PtParisA/lib_protocol/test/unit/test_full_staking_balance_repr.ml b/src/proto_019_PtParisA/lib_protocol/test/unit/test_full_staking_balance_repr.ml
new file mode 100644
index 0000000000000000000000000000000000000000..32f6695ca2b8cb085d150fc2fa6b06b7099463e3
--- /dev/null
+++ b/src/proto_019_PtParisA/lib_protocol/test/unit/test_full_staking_balance_repr.ml
@@ -0,0 +1,125 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs                 *)
+(*                                                                           *)
+(*****************************************************************************)
+
+(** Testing
+    -------
+    Component:    protocol
+    Invocation:   dune exec src/proto_019_PtParisA/lib_protocol/test/unit/main.exe \
+                  -- --file test_full_staking_balance_repr.ml
+    Subject:      test the Full_staking_balance_repr module
+*)
+
+open Protocol
+open Data_encoding
+
+(* We duplicate the definition of the Full_staking_balance_repr module
+   from Oxford to test a None case in the current encoding *)
+module Full_staking_balance_repr_oxford = struct
+  type t = {
+    own_frozen : Tez_repr.t;
+    staked_frozen : Tez_repr.t;
+    delegated : Tez_repr.t;
+  }
+
+  let make ~own_frozen ~staked_frozen ~delegated =
+    {own_frozen; staked_frozen; delegated}
+
+  let encoding =
+    let open Data_encoding in
+    conv
+      (fun {own_frozen; staked_frozen; delegated} ->
+        (own_frozen, staked_frozen, delegated))
+      (fun (own_frozen, staked_frozen, delegated) ->
+        {own_frozen; staked_frozen; delegated})
+      (obj3
+         (req "own_frozen" Tez_repr.encoding)
+         (req "staked_frozen" Tez_repr.encoding)
+         (req "delegated" Tez_repr.encoding))
+end
+
+let equal_full_staking_balance (a : Full_staking_balance_repr.t)
+    (b : Full_staking_balance_repr.t) =
+  let open Lwt_result_syntax in
+  let open Full_staking_balance_repr in
+  let open Full_staking_balance_repr.Internal_for_tests_and_RPCs in
+  let equal_tez_repr ~loc a b =
+    Assert.equal_int64 ~loc (Tez_repr.to_mutez a) (Tez_repr.to_mutez b)
+  in
+  let equal_cycle_repr ~loc a b =
+    Assert.equal_int32 ~loc (Cycle_repr.to_int32 a) (Cycle_repr.to_int32 b)
+  in
+
+  let* () = equal_tez_repr ~loc:__LOC__ (own_frozen a) (own_frozen b) in
+  let* () = equal_tez_repr ~loc:__LOC__ (staked_frozen a) (staked_frozen b) in
+  let* () =
+    equal_tez_repr ~loc:__LOC__ (current_delegated a) (current_delegated b)
+  in
+  let* () =
+    equal_tez_repr
+      ~loc:__LOC__
+      (min_delegated_in_cycle a)
+      (min_delegated_in_cycle b)
+  in
+  let* () =
+    let cycle s =
+      match level_of_min_delegated s with
+      | None -> Cycle_repr.root
+      | Some l -> l.cycle
+    in
+    equal_cycle_repr ~loc:__LOC__ (cycle a) (cycle b)
+  in
+  return_unit
+
+let equal_full_staking_balance_bytes sb_bytes
+    (sb_expected : Full_staking_balance_repr.t) =
+  let open Lwt_result_syntax in
+  let encoding = Full_staking_balance_repr.encoding in
+  let* sb =
+    match Binary.of_bytes encoding sb_bytes with
+    | Ok x -> return x
+    | Error e ->
+        failwith
+          "Data_encoding.Binary.read shouldn't have failed with \
+           Full_staking_balance_repr.encoding: %a"
+          Binary.pp_read_error
+          e
+  in
+  equal_full_staking_balance sb sb_expected
+
+let test_encodings () =
+  let open Lwt_result_syntax in
+  let own_frozen = Tez_repr.(mul_exn one 1) in
+  let staked_frozen = Tez_repr.(mul_exn one 2) in
+  let delegated = Tez_repr.(mul_exn one 5) in
+
+  (* Test a [Some] case for [added_in_p] *)
+  let staking_balance =
+    Full_staking_balance_repr.init
+      ~own_frozen
+      ~staked_frozen
+      ~delegated
+      ~current_level:Level_repr.Internal_for_tests.root
+  in
+  let encoding = Full_staking_balance_repr.encoding in
+  let sb_bytes = Binary.to_bytes_exn encoding staking_balance in
+  let* () = equal_full_staking_balance_bytes sb_bytes staking_balance in
+
+  (* Test a [None] case for [added_in_p] *)
+  let staking_balance_o =
+    Full_staking_balance_repr_oxford.make ~own_frozen ~staked_frozen ~delegated
+  in
+  let encoding_o = Full_staking_balance_repr_oxford.encoding in
+  let sb_o_bytes = Binary.to_bytes_exn encoding_o staking_balance_o in
+  let* () = equal_full_staking_balance_bytes sb_o_bytes staking_balance in
+  return_unit
+
+let tests =
+  Tztest.[tztest "full staking balance - encoding" `Quick test_encodings]
+
+let () =
+  Alcotest_lwt.run ~__FILE__ Protocol.name [("full_staking_balance", tests)]
+  |> Lwt_main.run
diff --git a/src/proto_019_PtParisA/lib_protocol/test/unit/test_time_repr.ml b/src/proto_019_PtParisA/lib_protocol/test/unit/test_time_repr.ml
index 32638c131184583d83f21b259706a873c226da2f..4afe670d46b2d18f8f3066b03250d64dbe15a59c 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/unit/test_time_repr.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/unit/test_time_repr.ml
@@ -1,9 +1,16 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2024 Nomadic Labs,                *)
+(*                                                                           *)
+(*****************************************************************************)
+
 (** Testing
     -------
     Component:  Protocol (time repr)
     Invocation: dune exec src/proto_019_PtParisA/lib_protocol/test/unit/main.exe \
                   -- --file test_time_repr.ml
-    Subject:    Error handling of time operations 
+    Subject:    Error handling of time operations
 *)
 
 open Protocol
diff --git a/src/proto_019_PtParisA/lib_protocol/test/unit/test_zk_rollup_storage.ml b/src/proto_019_PtParisA/lib_protocol/test/unit/test_zk_rollup_storage.ml
index c55095d7e57a1ff13e5d8d7e3649ee4eb52592c0..3987867a5dd09b7e0488c146238e274b2d171b7d 100644
--- a/src/proto_019_PtParisA/lib_protocol/test/unit/test_zk_rollup_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/test/unit/test_zk_rollup_storage.ml
@@ -1,25 +1,7 @@
 (*****************************************************************************)
 (*                                                                           *)
-(* Open Source License                                                       *)
-(* Copyright (c) 2022 Nomadic Labs            *)
-(*                                                                           *)
-(* Permission is hereby granted, free of charge, to any person obtaining a   *)
-(* copy of this software and associated documentation files (the "Software"),*)
-(* to deal in the Software without restriction, including without limitation *)
-(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
-(* and/or sell copies of the Software, and to permit persons to whom the     *)
-(* Software is furnished to do so, subject to the following conditions:      *)
-(*                                                                           *)
-(* The above copyright notice and this permission notice shall be included   *)
-(* in all copies or substantial portions of the Software.                    *)
-(*                                                                           *)
-(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
-(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
-(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
-(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
-(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
-(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
-(* DEALINGS IN THE SOFTWARE.                                                 *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2022 Nomadic Labs,                *)
 (*                                                                           *)
 (*****************************************************************************)
 
diff --git a/src/proto_019_PtParisA/lib_protocol/unstake_requests_storage.ml b/src/proto_019_PtParisA/lib_protocol/unstake_requests_storage.ml
index 89508fb9e16ccf1f5510e83f3dba76522ba1aef7..d6ca6d6deb5ba2fe8f690189cd3c516997c8c85f 100644
--- a/src/proto_019_PtParisA/lib_protocol/unstake_requests_storage.ml
+++ b/src/proto_019_PtParisA/lib_protocol/unstake_requests_storage.ml
@@ -115,12 +115,28 @@ let prepare_finalize_unstake ctxt ~for_next_cycle_use_only_after_slashing
           return_some {finalizable = []; unfinalizable = {delegate; requests}}
       | Some greatest_finalizable_cycle ->
           let* slashing_history_opt =
-            Storage.Contract.Slashed_deposits.find
+            Storage.Slashed_deposits.find ctxt delegate
+          in
+          let slashing_history =
+            Option.value slashing_history_opt ~default:[]
+          in
+          (* Oxford values *)
+          let* slashing_history_opt_o =
+            Storage.Contract.Slashed_deposits__Oxford.find
               ctxt
               (Contract_repr.Implicit delegate)
           in
+          let slashing_history_o =
+            Option.value slashing_history_opt_o ~default:[]
+            |> List.map (fun (a, b) -> (a, Percentage.convert_from_o_to_p b))
+          in
+
           let slashing_history =
-            Option.value slashing_history_opt ~default:[]
+            List.fold_left
+              (fun acc (cycle, percentage) ->
+                Storage.Slashed_deposits_history.add cycle percentage acc)
+              slashing_history_o
+              slashing_history
           in
           let finalizable, unfinalizable_requests =
             List.partition_map
@@ -169,12 +185,28 @@ module For_RPC = struct
     let slashable_deposits_period =
       Constants_storage.slashable_deposits_period ctxt
     in
+    let* slashing_history_opt = Storage.Slashed_deposits.find ctxt delegate in
+    let slashing_history = Option.value slashing_history_opt ~default:[] in
+
+    (* Oxford values *)
     let* slashing_history_opt =
-      Storage.Contract.Slashed_deposits.find
+      Storage.Contract.Slashed_deposits__Oxford.find
         ctxt
         (Contract_repr.Implicit delegate)
     in
-    let slashing_history = Option.value slashing_history_opt ~default:[] in
+    let slashing_history_o =
+      Option.value slashing_history_opt ~default:[]
+      |> List.map (fun (a, b) -> (a, Percentage.convert_from_o_to_p b))
+    in
+
+    let slashing_history =
+      List.fold_left
+        (fun acc (cycle, percentage) ->
+          Storage.Slashed_deposits_history.add cycle percentage acc)
+        slashing_history_o
+        slashing_history
+    in
+
     List.map_es
       (fun (request_cycle, request_amount) ->
         let new_amount =
diff --git a/src/proto_019_PtParisA/lib_protocol/validate.ml b/src/proto_019_PtParisA/lib_protocol/validate.ml
index 6775bf626eb6bd5d6632319c64c227299cd18e95..7915e67fe1dbc24a20c37ed2ff49e70c5e9e47e2 100644
--- a/src/proto_019_PtParisA/lib_protocol/validate.ml
+++ b/src/proto_019_PtParisA/lib_protocol/validate.ml
@@ -29,8 +29,8 @@ open Alpha_context
 type consensus_info = {
   predecessor_level : Raw_level.t;
   predecessor_round : Round.t;
-  preattestation_slot_map : (Consensus_key.pk * int) Slot.Map.t option;
-  attestation_slot_map : (Consensus_key.pk * int) Slot.Map.t option;
+  preattestation_slot_map : (Consensus_key.pk * int * int) Slot.Map.t option;
+  attestation_slot_map : (Consensus_key.pk * int * int) Slot.Map.t option;
 }
 
 let init_consensus_info ctxt (predecessor_level, predecessor_round) =
@@ -505,7 +505,7 @@ module Consensus = struct
     let*? () = check_round kind locked_round round in
     let expected_payload_hash = block_info.header_contents.payload_hash in
     let*? () = check_payload_hash kind expected_payload_hash bph in
-    let*? consensus_key, voting_power =
+    let*? consensus_key, voting_power, _dal_power =
       get_delegate_details consensus_info.preattestation_slot_map kind slot
     in
     return (consensus_key, voting_power)
@@ -533,7 +533,7 @@ module Consensus = struct
        however check that all preattestations have the same round in
        [check_construction_preattestation_round_consistency] further below. *)
     let*? () = check_payload_hash kind expected_payload_hash bph in
-    let*? consensus_key, voting_power =
+    let*? consensus_key, voting_power, _dal_power =
       get_delegate_details consensus_info.preattestation_slot_map kind slot
     in
     return (consensus_key, voting_power)
@@ -697,10 +697,11 @@ module Consensus = struct
 
   (** Attestation checks for all modes that involve a block:
       Application, Partial_validation, and Construction.
+      Checks regarding the DAL content are done separately.
 
       Return the slot owner's consensus key and voting power. *)
   let check_block_attestation vi consensus_info
-      {level; round; block_payload_hash = bph; slot} dal_content_opt =
+      {level; round; block_payload_hash = bph; slot} =
     let open Lwt_result_syntax in
     let*? expected_payload_hash =
       match Consensus.attestation_branch vi.ctxt with
@@ -717,20 +718,9 @@ module Consensus = struct
     let*? () = check_level kind consensus_info.predecessor_level level in
     let*? () = check_round kind consensus_info.predecessor_round round in
     let*? () = check_payload_hash kind expected_payload_hash bph in
-    let*? consensus_key, voting_power =
+    let*? consensus_key, voting_power, _dal_power =
       get_delegate_details consensus_info.attestation_slot_map kind slot
     in
-    let* () =
-      Option.fold
-        ~none:return_unit
-        ~some:(fun dal ->
-          Dal_apply.validate_block_attestation
-            vi.ctxt
-            level
-            consensus_key
-            dal.attestation)
-        dal_content_opt
-    in
     return (consensus_key, voting_power)
 
   let check_attestation vi ~check_signature
@@ -747,19 +737,8 @@ module Consensus = struct
     let* consensus_key, voting_power =
       match vi.mode with
       | Application _ | Partial_validation _ | Construction _ ->
-          check_block_attestation
-            vi
-            consensus_info
-            consensus_content
-            dal_content
+          check_block_attestation vi consensus_info consensus_content
       | Mempool ->
-          let* () =
-            Option.fold
-              ~none:return_unit
-              ~some:(fun dal ->
-                Dal_apply.validate_mempool_attestation vi.ctxt dal.attestation)
-              dal_content
-          in
           check_mempool_consensus
             vi
             consensus_info
@@ -767,6 +746,18 @@ module Consensus = struct
             consensus_content
     in
     let* () = check_delegate_is_not_forbidden vi.ctxt consensus_key.delegate in
+    let* () =
+      Option.fold
+        ~none:return_unit
+        ~some:(fun dal ->
+          Dal_apply.validate_attestation
+            vi.ctxt
+            consensus_content.level
+            consensus_content.slot
+            consensus_key
+            dal.attestation)
+        dal_content
+    in
     let*? () =
       if check_signature then
         Operation.check_signature
diff --git a/tezt/lib_tezos/protocol.ml b/tezt/lib_tezos/protocol.ml
index e35c8f18aac8846489282285bc22f9dc267eab9e..3addd5b169e841c92542a5c31b8d9797a1af9504 100644
--- a/tezt/lib_tezos/protocol.ml
+++ b/tezt/lib_tezos/protocol.ml
@@ -60,7 +60,7 @@ let tag protocol = String.lowercase_ascii (name protocol)
 let hash = function
   | Alpha -> "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK"
   | Oxford -> "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH"
-  | Paris -> "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5"
+  | Paris -> "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc"
 
 let genesis_hash = "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im"
 
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- delegates.out
index c1abbfa75d2ad572971f2855c275b85d972fe115..29602dc55a142c53e37b467120970e13c4e5ad95 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- delegates.out	
@@ -21,7 +21,11 @@
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 5, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- mempool.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- mempool.out
index 4d2fe2efde04b6ebee67fa1476418c6409ec34d9..73de5abc92ca7a96a7f7b00b52c7e653a3773b4f 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- mempool.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- mempool.out	
@@ -1,10 +1,10 @@
 
 curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
 []
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
 
 ./octez-client rpc get '/chains/main/mempool/pending_operations?version=2&validated=true&refused=true&outdated=true&branch_delayed=true&branch_refused=true'
 { "validated":
@@ -20,7 +20,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -36,7 +36,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -53,7 +53,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -87,7 +87,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -103,7 +103,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -120,7 +120,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -150,7 +150,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -166,7 +166,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -183,7 +183,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -222,7 +222,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -242,7 +242,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [], "refused": [], "outdated": [], "branch_refused": [],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -262,7 +262,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [], "refused": [], "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -284,7 +284,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "branch_delayed": [], "unprocessed": [] }
 
 curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"permanent","id":"proto.019-PtParisA.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"permanent","id":"proto.019-PtParisA.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
 
 ./octez-client rpc get /chains/main/mempool/filter
 { "minimal_fees": "100", "minimal_nanotez_per_gas_unit": [ "100", "1" ],
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- misc_protocol.out
index 1d9060d2c4c89ece64b38bc9eca803c8f4844d57..23fd8a4909f515c7c93c08eed7a93b0f6509445b 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode client) RPC regression tests- misc_protocol.out	
@@ -38,9 +38,9 @@
   "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,
-      "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 },
+      "number_of_slots": 16, "attestation_lag": 8,
+      "attestation_threshold": 66, "redundancy_factor": 8, "page_size": 3967,
+      "slot_size": 126944, "number_of_shards": 256 },
   "smart_rollup_arith_pvm_enable": false,
   "smart_rollup_origination_size": 6314,
   "smart_rollup_challenge_window_in_blocks": 120960,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- delegates.out
index 746c00447034f896be4ae2a3e45503fd14740408..d3577edcf2c118f6708f122400183f745bcfaee5 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- delegates.out	
@@ -21,7 +21,11 @@
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 5, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- misc_protocol.out
index e0ab02cc8c52fd40b1599b250e8a5e0d68823e9a..18fb176fa807c0dd212ef5ee792e3a229877e101 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode light) RPC regression tests- misc_protocol.out	
@@ -38,9 +38,9 @@
   "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,
-      "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 },
+      "number_of_slots": 16, "attestation_lag": 8,
+      "attestation_threshold": 66, "redundancy_factor": 8, "page_size": 3967,
+      "slot_size": 126944, "number_of_shards": 256 },
   "smart_rollup_arith_pvm_enable": false,
   "smart_rollup_origination_size": 6314,
   "smart_rollup_challenge_window_in_blocks": 120960,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- delegates.out
index 71334ef90f47b854c0d57d18f3025c935d09761e..6982ef2ae258d70a82143ca34669eacf515ae1c2 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- delegates.out	
@@ -21,7 +21,11 @@
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 5, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- mempool.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- mempool.out
index c17e879607fa4a506cb5b2970ad7a663247af872..5a0357e01061d8e9bcf642e8947a3c1d11752fad 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- mempool.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- mempool.out	
@@ -1,10 +1,10 @@
 
 curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
 []
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"}]
 
 ./octez-client --mode proxy rpc get '/chains/main/mempool/pending_operations?version=2&validated=true&refused=true&outdated=true&branch_delayed=true&branch_refused=true'
 { "validated":
@@ -20,7 +20,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -36,7 +36,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -53,7 +53,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -87,7 +87,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -103,7 +103,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -120,7 +120,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -150,7 +150,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -166,7 +166,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -183,7 +183,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -222,7 +222,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -242,7 +242,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [], "refused": [], "outdated": [], "branch_refused": [],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -262,7 +262,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
 { "validated": [], "refused": [], "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+        "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -284,7 +284,7 @@ curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=t
   "branch_delayed": [], "unprocessed": [] }
 
 curl -s 'http://[HOST]:[PORT]/chains/main/mempool/monitor_operations?validated=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
-[{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"permanent","id":"proto.019-PtParisA.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]"},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"0","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"permanent","id":"proto.019-PtParisA.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"1","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"branch","id":"proto.019-PtParisA.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc","branch":"[BRANCH_HASH]","contents":[{"kind":"transaction","source":"[PUBLIC_KEY_HASH]","fee":"1000","counter":"5","gas_limit":"1040","storage_limit":"257","amount":"1000000","destination":"[PUBLIC_KEY_HASH]"}],"signature":"[SIGNATURE]","error":[{"kind":"temporary","id":"proto.019-PtParisA.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
 
 ./octez-client --mode proxy rpc get /chains/main/mempool/filter
 { "minimal_fees": "100", "minimal_nanotez_per_gas_unit": [ "100", "1" ],
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- misc_protocol.out
index e0016303b2aa6cff1e4ed6f1a227b06333dc9aed..e32252a663feab4e1d34363954dfed92052506b7 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy) RPC regression tests- misc_protocol.out	
@@ -38,9 +38,9 @@
   "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,
-      "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 },
+      "number_of_slots": 16, "attestation_lag": 8,
+      "attestation_threshold": 66, "redundancy_factor": 8, "page_size": 3967,
+      "slot_size": 126944, "number_of_shards": 256 },
   "smart_rollup_arith_pvm_enable": false,
   "smart_rollup_origination_size": 6314,
   "smart_rollup_challenge_window_in_blocks": 120960,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- delegates.out
index c1abbfa75d2ad572971f2855c275b85d972fe115..29602dc55a142c53e37b467120970e13c4e5ad95 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- delegates.out	
@@ -21,7 +21,11 @@
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 5, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out
index 4b95bc68d5c4c0f32e51869da26724ea68406edd..fa4874fddcc188b0465d07fa6067a145b8bf5785 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out	
@@ -38,9 +38,9 @@
   "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,
-      "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 },
+      "number_of_slots": 16, "attestation_lag": 8,
+      "attestation_threshold": 66, "redundancy_factor": 8, "page_size": 3967,
+      "slot_size": 126944, "number_of_shards": 256 },
   "smart_rollup_arith_pvm_enable": false,
   "smart_rollup_origination_size": 6314,
   "smart_rollup_challenge_window_in_blocks": 120960,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- delegates.out
index c1abbfa75d2ad572971f2855c275b85d972fe115..29602dc55a142c53e37b467120970e13c4e5ad95 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- delegates.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- delegates.out	
@@ -21,7 +21,11 @@
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 5, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out
index 4b95bc68d5c4c0f32e51869da26724ea68406edd..fa4874fddcc188b0465d07fa6067a145b8bf5785 100644
--- a/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out	
+++ b/tezt/tests/expected/RPC_test.ml/Paris- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out	
@@ -38,9 +38,9 @@
   "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,
-      "page_size": 4096, "slot_size": 65536, "number_of_shards": 2048 },
+      "number_of_slots": 16, "attestation_lag": 8,
+      "attestation_threshold": 66, "redundancy_factor": 8, "page_size": 3967,
+      "slot_size": 126944, "number_of_shards": 256 },
   "smart_rollup_arith_pvm_enable": false,
   "smart_rollup_origination_size": 6314,
   "smart_rollup_challenge_window_in_blocks": 120960,
diff --git a/tezt/tests/expected/baker_test.ml/Paris- Baker rewards.out b/tezt/tests/expected/baker_test.ml/Paris- Baker rewards.out
index a1bce7fdab2ca3e20922de3d5555e97fc0b3807f..be535600065d401fc32b6090fc0d0077324e48cc 100644
--- a/tezt/tests/expected/baker_test.ml/Paris- Baker rewards.out	
+++ b/tezt/tests/expected/baker_test.ml/Paris- Baker rewards.out	
@@ -1,7 +1,7 @@
 
 ./octez-client rpc get /chains/main/blocks/head/metadata
-{ "protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
-  "next_protocol": "PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5",
+{ "protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
+  "next_protocol": "PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc",
   "test_chain_status": { "status": "not_running" }, "max_operations_ttl": 2,
   "max_operation_data_length": 32768, "max_block_header_length": 289,
   "max_operation_list_length":
@@ -21,19 +21,24 @@
     [ { "kind": "minted", "category": "bootstrap",
         "change": "-20000000000000", "origin": "migration" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "400000000000", "origin": "migration" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "400000000000", "origin": "migration" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "400000000000", "origin": "migration" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "400000000000", "origin": "migration" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "400000000000", "origin": "migration" },
       { "kind": "contract",
         "contract": "[PUBLIC_KEY_HASH]",
@@ -53,7 +58,8 @@
       { "kind": "minted", "category": "baking rewards", "change": "-333334",
         "origin": "block" },
       { "kind": "freezer", "category": "deposits",
-        "staker": { "baker": "[PUBLIC_KEY_HASH]" },
+        "staker":
+          { "baker_own_stake": "[PUBLIC_KEY_HASH]" },
         "change": "333334", "origin": "block" },
       { "kind": "minted", "category": "baking rewards", "change": "-2999999",
         "origin": "block" },
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus - destination).out
index 5cdd1a09377af71b0f5465d23d7cd7bae0158d91..6c45d78fb53022a565cbb7b4b0187e8fe1062fdc 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus - destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus - destination).out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000333333",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000003298113",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001595660", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001595660",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -65,7 +77,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000003298113",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001595660", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001595660",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -106,8 +122,13 @@ This sequence of operations was run:
 { "full_balance": "238000528932", "current_frozen_deposits": "200000181573",
   "frozen_deposits": "200000083983", "staking_balance": "238000528932",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "4",
-  "deactivated": false, "grace_period": 4, "pending_denunciations": false,
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle":
+    { "amount": "4",
+      "level":
+        { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
+  "grace_period": 4, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
   "active_consensus_key": "[PUBLIC_KEY_HASH]" }
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus -- destination).out
index 945261d8da9ecd83c182990e665d3d03798dcc56..181861305420bd8379b873bd4fb3d966b9ccf293 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus -- destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker - delegate - consensus -- destination).out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000333333",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000003298113",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001595660", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001595660",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -65,7 +77,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000003298113",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001595660", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001595660",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -106,8 +122,13 @@ This sequence of operations was run:
 { "full_balance": "238000528932", "current_frozen_deposits": "200000181573",
   "frozen_deposits": "200000083983", "staking_balance": "238000528932",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "4",
-  "deactivated": false, "grace_period": 4, "pending_denunciations": false,
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle":
+    { "amount": "4",
+      "level":
+        { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
+  "grace_period": 4, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
   "active_consensus_key": "[PUBLIC_KEY_HASH]" }
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus - destination).out
index e86e3964537fdbfd963b51d9d12b96cf3ae3db7e..3a0272bda3bb286fc205e3e3e7fcb6e164217d91 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus - destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus - destination).out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "3999999999716",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000002964496",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001278724", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001278724",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -65,7 +77,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000002964496",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001278724", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001278724",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -106,8 +122,13 @@ This sequence of operations was run:
 { "full_balance": "238000509096", "current_frozen_deposits": "200000164892",
   "frozen_deposits": "200000067302", "staking_balance": "238000509096",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "18",
-  "deactivated": false, "grace_period": 4, "pending_denunciations": false,
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle":
+    { "amount": "18",
+      "level":
+        { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
+  "grace_period": 4, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
   "active_consensus_key": "[PUBLIC_KEY_HASH]" }
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus -- destination).out
index f845c4c2c4eed7c1bf12fb364ae71425833fc893..77a75198688fcff55e059df8846293314615f088 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus -- destination).out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test drain delegate with (baker -- delegate - consensus -- destination).out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "3999999999716",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000002964496",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001278724", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001278724",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -65,7 +77,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000002964496",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001278724", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001278724",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -106,8 +122,13 @@ This sequence of operations was run:
 { "full_balance": "238000509096", "current_frozen_deposits": "200000164892",
   "frozen_deposits": "200000067302", "staking_balance": "238000509096",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "18",
-  "deactivated": false, "grace_period": 4, "pending_denunciations": false,
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle":
+    { "amount": "18",
+      "level":
+        { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
+  "grace_period": 4, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
   "active_consensus_key": "[PUBLIC_KEY_HASH]" }
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test register with consensus key.out b/tezt/tests/expected/consensus_key.ml/Paris- Test register with consensus key.out
index 668993b15b0e07f5640132105f8f8a0dc2195a25..4430708cc7461bd8752d3bd6370c6f1acd1c6381 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test register with consensus key.out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test register with consensus key.out	
@@ -64,8 +64,13 @@ This sequence of operations was run:
 { "full_balance": "999999999385", "current_frozen_deposits": "0",
   "frozen_deposits": "0", "staking_balance": "999999999385",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "999999999385",
-  "deactivated": false, "grace_period": 3, "pending_denunciations": false,
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle":
+    { "amount": "999999999385",
+      "level":
+        { "level": 3, "level_position": 2, "cycle": 0, "cycle_position": 2,
+          "expected_commitment": false } }, "deactivated": false,
+  "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "active_consensus_key": "[PUBLIC_KEY_HASH]",
   "pending_consensus_keys":
@@ -78,7 +83,8 @@ This sequence of operations was run:
 { "full_balance": "999999999385", "current_frozen_deposits": "49999999970",
   "frozen_deposits": "0", "staking_balance": "999999999385",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
-  "delegated_balance": "0", "min_delegated_in_current_cycle": "949999999415",
+  "delegated_balance": "0",
+  "min_delegated_in_current_cycle": { "amount": "949999999415" },
   "deactivated": false, "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "active_consensus_key": "[PUBLIC_KEY_HASH]" }
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is delegate.out b/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is delegate.out
index ce52bbd3718f475ed39cbcbf4c3f0c4d6e395c31..b410b3ee2c9eee814d21f63c3886beee474bd985 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is delegate.out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is delegate.out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000333333",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000003298113",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001595660", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001595660",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is not delegate.out b/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is not delegate.out
index f4f8eb4a0091fcb47fe25e9605a866f38fea432f..bc49237f11bc75d0a93ae6ea78a4a74befb45435 100644
--- a/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is not delegate.out	
+++ b/tezt/tests/expected/consensus_key.ml/Paris- Test set consensus key - baker is not delegate.out	
@@ -30,7 +30,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000000000000",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800000000000", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800000000000",
+      "level":
+        { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -41,7 +45,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "3999999999716",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3799999999716", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3799999999716",
+      "level":
+        { "level": 2, "level_position": 1, "cycle": 0, "cycle_position": 1,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
@@ -54,7 +62,11 @@ This sequence of operations was run:
   "frozen_deposits": "200000000000", "staking_balance": "4000002964496",
   "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ],
   "delegated_balance": "0",
-  "min_delegated_in_current_cycle": "3800001278724", "deactivated": false,
+  "min_delegated_in_current_cycle":
+    { "amount": "3800001278724",
+      "level":
+        { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0,
+          "expected_commitment": false } }, "deactivated": false,
   "grace_period": 3, "pending_denunciations": false,
   "total_delegated_stake": "0", "staking_denominator": "0",
   "voting_power": "4000000000000", "remaining_proposals": 20,
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input254251340-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input254251340-.out
index 2b6967edc49538be55373a4dbbd966e9db85adb9..76d69b839e03faa23226a2f3806d10772064e944 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input254251340-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input254251340-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 948 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 948 --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input420401245-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input420401245-.out
index 55721a795c49cdb767eccdc2c50af673c878f709..494f7ed0f886a841d608d2d1c5f28483a417be04 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input420401245-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input420401245-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 12039123919239192312931 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 12039123919239192312931 --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input680650890-.out
index 7442360066d41df115b92d5533f11232e8f29d76..caf0d70344f43fffe7d0430eea591277305b10e5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -abs--storage125992234--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/abs.tz on storage Unit and input 0 --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add--storage125992234--input125992234-.out
index 0306ad43eda196aaee0b38d35c15a55b0f333c88..a8dce07dbac7feff444661468632aba689d7ddc3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out
index a514fcce0e8a2df6333ca8b66629b896eb203c5e..6c35dab0006b27e2e532c36bcd0cd60275e4eeeb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x01 0x00' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x01 0x00' --level 1 --trace-stack
 storage
   (Some 0x0100000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out
index 912f666e0c53d8d9bcf992a4f126c1fc131f566b..3573f01aeab14e904e109d8d3d278ece5150b223 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x010000 0x010000' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x010000 0x010000' --level 1 --trace-stack
 storage
   (Some 0x0200000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out
index cc8f7a96930adea3cee1680c1eba7406f7e242d6..d9e812c930d26145b49f6f9f074db8e44821fa79 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x010000 0x00' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x010000 0x00' --level 1 --trace-stack
 storage
   (Some 0x0100000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out
index c56d5f273c2597a22e1a45f45cf185e3c06b4377..2d6af7d3c3c69afc323280dbac7f68012410ddd4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x00 0x00' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_bls12_381_fr.tz on storage None and input 'Pair 0x00 0x00' --level 1 --trace-stack
 storage
   (Some 0x0000000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input249636002-.out
index 7d90c68a241061b8494cebc1e495d38fa7ac712e..1832e32c96d7c87dc9daf0f3d2b80e8a58f599aa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair 100 100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair 100 100)' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:03:20Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input267363182-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input267363182-.out
index 9f38d996d4a42996c8ce4efa30bdb43da7aefae2..718c731125db2c70979f7c9419c09a50b22f4774 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input267363182-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input267363182-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair -100 100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair -100 100)' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:00:00Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input438561129-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input438561129-.out
index a2916bbccfb554bf4da075a7693564ec245707e4..1fe202ea8584df78f000031b73b11087967f4e01 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input438561129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_delta_timestamp--storage921624073--input438561129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair 0 "1970-01-01T00:00:00Z")' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_delta_timestamp.tz on storage None and input '(Pair 0 "1970-01-01T00:00:00Z")' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:00:00Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input249636002-.out
index b6edcdf1346e3420a2873dc9b34b7fb7be1f4b56..6d5039425e7d1465da35335d707a79bba8fabd2f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair 100 100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair 100 100)' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:03:20Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input307538219-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input307538219-.out
index 3fe453b6564991e56f60abf216c1333d1a8df2df..426b08ea3d77e316f1f15425ae9113cb498bc807 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input307538219-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input307538219-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair 100 -100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair 100 -100)' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:00:00Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input373737581-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input373737581-.out
index fb178be58d56417fd24d3799a819d579306b10f6..e79372d9c1a33632098aaec0dd37ff2ef77ae8e1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input373737581-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -add_timestamp_delta--storage921624073--input373737581-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair "1970-01-01T00:00:00Z" 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/add_timestamp_delta.tz on storage None and input '(Pair "1970-01-01T00:00:00Z" 0)' --level 1 --trace-stack
 storage
   (Some "1970-01-01T00:00:00Z")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -address--storage921624073--input117475800-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -address--storage921624073--input117475800-.out
index 475d111c59bdab31040e4ea3ebe93787156f4eb8..6b762c01058f5fdfd082a7218112c63b5f1e3f38 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -address--storage921624073--input117475800-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -address--storage921624073--input117475800-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/address.tz on storage None and input '"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/address.tz on storage None and input '"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"' --level 1 --trace-stack
 storage
   (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input106930123-.out
index 1bcebe7f527c368f54d021f4f7a9196f95979b7c..1ed059eb6f12b826e977de741bd4b04f7179c582 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input181204719-.out
index 164b5072a534f969cfa2d40c61132a2c4fd1ee19..292612b7debb50c9070c37c590fc53ab40630157 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input223774825-.out
index 560fbb1325c89c00438581eff6b2c0f1c6bf264b..e774de162b74ad6ee09842d8b904d7d114f23def 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input908807505-.out
index f856705ad1529de1550652d64c06198d93ad9250..991ecdb7a2764cb87f8cee8883531f374f33842f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_binary--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_binary--storage125992234--input125992234-.out
index b604d018c485b0f57ef5a64fe39b71f463759f0b..665257b0c9b30f38773714cb67a90d37cf04e0df 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_binary--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_binary--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_binary.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_binary.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_bytes--storage125992234--input125992234-.out
index d0e9045a7ad131fae5903183f1849708abadb571..4f9f36ff106ce3baba117e42baf7f7dc1b7731e2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input106930123-.out
index 125937fb44c08727ecd7c68e3697d4ff1d0612ea..afc27439bcf24823d536933765a975514abe7885 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair False True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair False True)' --level 1 --trace-stack
 storage
   False
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input181204719-.out
index fe27e45f21ba047e4d8ca045dfa93748472b328c..356d360094deaadaf8d5bab50540cd8a616ece08 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair True False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair True False)' --level 1 --trace-stack
 storage
   False
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input223774825-.out
index c895f07945dfb3421d42c6f4382536008bd2ff13..114270b0c08377ba4d3b196447a4619f18960474 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair False False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair False False)' --level 1 --trace-stack
 storage
   False
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input908807505-.out
index 859de2e98000f5bd013469af8796eb8a33ebcd73..a67d3042f47fff249ff3cd7aeb4d5a4e5eb0fd5f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -and_logical_1--storage570553153--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair True True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/and_logical_1.tz on storage False and input '(Pair True True)' --level 1 --trace-stack
 storage
   True
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -balance--storage492856247--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -balance--storage492856247--input125992234-.out
index 939468e913a75114856741c17b8f947c71a84ce0..8d4973efbf4f911e1701cb30927013aab3b102c7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -balance--storage492856247--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -balance--storage492856247--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/balance.tz on storage 111 and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/balance.tz on storage 111 and input Unit --level 1 --trace-stack
 storage
   4000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage495706788--input453441034-.out
index dbccefa1161c45e0e41fb2b8e85da9c7136bec54..89a6c0402cf1aef37bd9394696631f6a7cd41010 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair {} None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair {} None)' and input 1 --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input453441034-.out
index a61f34a192c84dda20f6c248fb805280641d883b..01f12eb9b54e603c428721879dca681cb78888d0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input564400327-.out
index 1efb9d92d3187c8eba024f3721b2081f16c955a5..01ea5e6916162f9ff1f16828da61a70edc6916bf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 2 --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input654274102-.out
index 3b4c266a47f19deaf55660329401ba32ac2f442b..70ca958b900785d1d17c67b369b50699bf4e4eca 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 3 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 3 --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage690637660--input453441034-.out
index 68b50db8a0abe407e53aef775437b14dd53badaf..3a726c206b2ef146b32190e75d170b0773d85e60 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 0 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 1 0 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage806237530--input453441034-.out
index 5b25686b8284d756ae0b35d8dcff1775c31acf4e..326e6cf9b60ddb6eb0c715b411153c625b7e0991 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 0 1 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_nat.tz on storage '(Pair { Elt 0 1 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input1071610051-.out
index c803076bba7f80f5890862fe6ba903b5b78272e1..505ce20c7f29cb22e62784053d865812dab6eb08 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"baz"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"baz"' --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input700475845-.out
index 5197d6e9c6805902d71a5f6072b858290983f235..5dec9e8330558fc15e17d31a96e8dcc2069cb24c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input905318451-.out
index e6eab0c5417ca351fd95ff7fddf7a0c619aebc36..294959df9aacf17f98f6854e5cbb6cffb2a9858c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"foo"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"foo"' --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage495706788--input700475845-.out
index ede1b2b2d116cc645a72c4fe3ad1c34beda75674..880f052616ce97c352f076c5612caad89eabc69b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair {} None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair {} None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage915708427--input700475845-.out
index 32de7f57009dd10ac6369c8973362711e8cd9c6c..5b5464925639b64f406948a91fdc46e10bc72e20 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "foo" 1 } None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "foo" 1 } None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair 4 (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage936682951--input905318451-.out
index 1ccf32f55766be5f24dc2d663dcd88afbfa7731b..58650e1b66250879d21de9bc154a7042422b3953 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "foo" 0 } None)' and input '"foo"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/big_map_mem_string.tz on storage '(Pair { Elt "foo" 0 } None)' and input '"foo"' --level 1 --trace-stack
 storage
   (Pair 4 (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input12599.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input12599.out
index 7d540ca5a5f50a2818d5f30ac73a5dd18cda73b2..f845c49274e177c984bd4ca88d478d56aba56912 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input12599.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input12599.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_push_bytes_not_padded.tz on storage None and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_push_bytes_not_padded.tz on storage None and input Unit --level 1 --trace-stack
 storage
   (Some 0x0000000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out
index 0d7c211afae9a695e24ef57b4cd02cf5f73bf562..1bd22be441ed0e7a024d1af3fdda7785ac448c72 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_push_nat.tz on storage None and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_push_nat.tz on storage None and input Unit --level 1 --trace-stack
 storage
   (Some 0x1000000000000000000000000000000000000000000000000000000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out
index da43a70bccd463584f506ef92c8eca6e8e775910..ca2f3b7c7177f2299bfb827dd19bb6526b013571 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x01 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x01 --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out
index 26bf85a32b375197f2b539297190afd6666dca5c..bfe337526cc436cd84388b2852a7f5501ffd54eb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x00 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x00 --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out
index ab01e0ee9fe9a887310815bccd1c34a420ae9550..7e0461443434b74b82611aa04ebee9fb7501c5da 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 --level 1 --trace-stack
 storage
   11320265829256585830781521966149529460476767408210445238902869222031333517497
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out
index 2894b06c38fa8a7823b1edc91c0f4307d207db35..a95814a95772c72aefd57527eec39b41d9ed2977 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz on storage 0 and input 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 --level 1 --trace-stack
 storage
   17832688077013577776524784494464728518213913213412866604053735695200962927400
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out
index 2e8cf3293d6c9ac2ea884c6c2f0495b48a8cbf81..c6579d837bb6b454a0a3d9efe2a6be8244c661d0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_mutez.tz on storage 0 and input 0x10 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_to_mutez.tz on storage 0 and input 0x10 --level 1 --trace-stack
 storage
   16
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out
index f794d656401c5d1f6383a36197106d73283596d4..b994b7cbc8ceacbe5dd7ade3ed0d0b8fd9849b21 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
 storage
   0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out
index fde4da62f77b90db6651a54452d9320f2067e088..15b7eebe59e8bfcfb1f33be7ea7bc2657d98b5a4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
 storage
   0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out
index 80363dbac27438a45cc5b9aca41be78d13d58baa..c6510dad68bfbd426fee9141bdc2a2fc04df1347 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out
index 48e92fa2b1b56e16c14e21bd3a52de09d30c7df7..f285fce594c1d635cbecf3d4ac83a73200a02113 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out
index 83deba4dae047be8f39467ce0308ebf131b4db08..abc7c504f644bb4570613d33222cf4f82a540e20 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out
index f2513a64008373fb1503f6164c5a4b1aa29898e9..0be4d48600bf69ceaec686b7fc15a6a357b2e516 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out
index 91d1e95c2d348442d9c493d72fc7693ab4978663..1af3575834d3e28d39074f6ac55440b6c736920b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
 storage
   0x0200000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out
index b1580789d7c2b42fdcb9dcfccb91abdaedc53c4b..b8b293f39974566eb1e006366b72b2ea29430099 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -42 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -42 --level 1 --trace-stack
 storage
   0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out
index 0767be19d16828601e611be7df61f91ebb8168ce..c2bdde59a5e0baa626efd011dfd049d19e045a9f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
 storage
   0x0000000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out
index 6d3d98d811035364432738c1fd4589c210e07497..0c6ddd31cc610e8fdd39ff98c78f39b06ef35f95 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -1 --level 1 --trace-stack
 storage
   0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out
index ea5120aad99aec84e0eb0062d8396f1933cf21ca..99043e2877dd7151ca487299316b3a122b8765ae 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
 storage
   0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out
index da2eff01c91271ca92e6ea46c0374f1efc65b32e..801a881603667df668b23d0a40122a806c2a357e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
 storage
   0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out
index 5ba3789876dde4c59aff6c7b76a55a935ddc8db3..81b3eea289b9c02cd1cd60bb96b212793c7bd6b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out
index 2fb9692c0a6272320931a2ff336561fd85c11531..29739a115df5a0ecfd0cd0c8636b8546fca9dcdb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out
index 0ace00ac5b4a8b91da67585e3b7e39847fedc9d3..c38ee783430459139834ee25a93f09748546ae52 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out
index f4a690c65c0428ee0e444f9d97a2601a07faa195..385e1da02c19d807990d7803790c4d06d35e7541 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out
index 15b963007d5b11e8f2c4857d4a2ef5f3434f8b68..11489b3e37a09fb7b163c737a4a0dea2d97a2974 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
 storage
   0x0200000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out
index cfd90add877a762437d4e918901d5fe1111f172e..9cbc00ac9bb3252917c5b891b72506e5457f256d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
 storage
   0x0000000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out
index ea7456421887badab1394f5c28547253d11ce340..e4a8e355ab57536446cfb2acb72821ebc2905699 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
 storage
   0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out
index 61ae889e0f8255b37cbccfbd767659b06a49f171..c10919c1c626b311f47d4919b690dad42a4bc6f1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
 storage
   0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out
index b8ee3015507c690af648933ee7ac04d77ebba1c8..b045522d836a312b1b04d7373f20b8dcdb95cf45 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out
index c77045e47027e658668b87ff5a46e5cc8e153ec6..69fbac1fdddace1907263bb130ded1203c9233c0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out
index 8d72868eed8943c39087e317a4be29fafe694397..0fe0bbcade4ffb04cb4809336d2d9d6e13a91bdc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out
index 1e6f18757c8a768d81a2551a628fc90a111dedd8..88bcca8ea1c7f6a9085f8d1db3b66958bb91ab10 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out
index c49c6d169128a66c69f25791669fe20ea6749bce..04a51ffd130fa132c227c8fe277d1a6293b48721 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
 storage
   0x0200000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out
index 9102fe841cb0ad693eb75a23a713c46264fdda77..b3016690de631fbafab54089ca6294acf60a0715 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -42 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -42 --level 1 --trace-stack
 storage
   0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out
index 88a23ef65cc4db3aa59e70e272e436db60d27052..6c8fb97327cd225a0ccc3ece65c606c58e79efbd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
 storage
   0x0000000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out
index 1313a5dffff485f94ed75a787ff74cfc364987c8..ce98a2440dbdc87f107a906f94a43f7fb3b454f6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input -1 --level 1 --trace-stack
 storage
   0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out
index 489b24d8a2f2e914464a6af595f330ee74808372..a1063de26e21b3b2ac6166b2a2ddf3038d44ec4e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f and input 22620284817922784902564672469917992996328211127984472897491698543785655336309 --level 1 --trace-stack
 storage
   0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out
index 0cf37f57c8f14720a5f395849887f393fabc8612..5f15995a1b6a81dc0928a86dae86cb58c9dd103c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f and input 33644916630334844239120348434626468649534186770809802792596996408934105684394 --level 1 --trace-stack
 storage
   0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out
index b6b651c0ff3d3befc56bed16836769636a1816ba..2016a503b7b6ad6cb98b1cf116de01d865ce0fdd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 69615968247920749285624776342583898043608129789011377475114141186797415307882 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out
index 97682ff797b2f0b858d96436eeb713d2d698b797..b13e0e76b72d0b90393d1332cac728aab5c228ef 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d and input 17180093072794558806177035834397932205917577288483739652510482486858834123369 --level 1 --trace-stack
 storage
   0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out
index ad7115e19f510872addce7ad198ad0b97cdba033..cba077855fc0a51a28481761292d90819c82ddc2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 52435875175126190479447740508185965837690552500527637822603658699938581184514 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out
index 8bad3d14f74a98145155cabd5dbddd5ca4447a3b..40082fb2cbbb520ea06be0584c4abaa4b5fc490c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 1 --level 1 --trace-stack
 storage
   0x0100000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out
index 459f0619acef9255b877e8574951924a08af78b3..75bbc94d53b521778d7463f4c1e7124f6e006106 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 2 --level 1 --trace-stack
 storage
   0x0200000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out
index a2a2f0e8941e370ed86721221dc85ea3f1875ef8..16e043c9e61b4327eab74a739b92962014cba2f7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz on storage 0x0100000000000000000000000000000000000000000000000000000000000000 and input 0 --level 1 --trace-stack
 storage
   0x0000000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_int--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_int--storage125992234--input125992234-.out
index 80edfc6e47bcee33f29ad3f01ea79fa90a91523d..95a513abf98886a6f2a0e3d528ae8e794d1eae14 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_int--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_int--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bytes_of_int_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bytes_of_int_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_nat--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_nat--storage125992234--input125992234-.out
index a5679c59e0044661362da60fe9da6a07d4e95471..3dc7a20c0c48ac897744d99c1de371e415e9299f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_nat--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -bytes_of_nat--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bytes_of_nat_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/bytes_of_nat_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -car--storage680650890--input783124233-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -car--storage680650890--input783124233-.out
index d90a447d95b23d4e1ea1897381a5c9e70cd04d49..548bb98daa03c6e178a3c6ed189f5b4eef911912 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -car--storage680650890--input783124233-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -car--storage680650890--input783124233-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/car.tz on storage 0 and input '(Pair 34 17)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/car.tz on storage 0 and input '(Pair 34 17)' --level 1 --trace-stack
 storage
   34
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cdr--storage680650890--input783124233-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cdr--storage680650890--input783124233-.out
index df178a059edd5a4c2951f205751d8c932af3d460..8052a9b8d6952eaf3dac76e31d189b0b774ce7af 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cdr--storage680650890--input783124233-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cdr--storage680650890--input783124233-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cdr.tz on storage 0 and input '(Pair 34 17)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cdr.tz on storage 0 and input '(Pair 34 17)' --level 1 --trace-stack
 storage
   17
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage109160754--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage109160754--input125992234-.out
index 6c8090bb95d44d4f6edf6394dde8be809939128c..b05d98ab3d7926746dc4c9082a05a43b1d95d37c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage109160754--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage109160754--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage '(Some 0x7a06a770)' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage '(Some 0x7a06a770)' and input Unit --level 1 --trace-stack
 storage
   (Some "NetXynUjJNZm7wi")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage921624073--input125992234-.out
index e540901d7fb1dc03d0b6c21ac02eec23b1122b9f..a71cc378b4ac38598c76d77fd3cae9733625308b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage None and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage None and input Unit --level 1 --trace-stack
 storage
   (Some "NetXynUjJNZm7wi")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage981066851--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage981066851--input125992234-.out
index 932e351f06d0b0a34790e6f44c1604bfad043bc9..32f7acc0d020d66a8c72ac3c47386444f11485c5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage981066851--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -chain_id_store--storage981066851--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage '(Some "NetXynUjJNZm7wi")' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/chain_id_store.tz on storage '(Some "NetXynUjJNZm7wi")' and input Unit --level 1 --trace-stack
 storage
   (Some "NetXynUjJNZm7wi")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb--storage950292965--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb--storage950292965--input125992234-.out
index f3930c2e8f5b972a870f62ee0e7857bfb6396835..174dea56b122f89df196c94673a14e4268f876bb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb--storage950292965--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb--storage950292965--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb.tz on storage '(Pair 0 0 0)' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb.tz on storage '(Pair 0 0 0)' and input Unit --level 1 --trace-stack
 storage
   (Pair 1 2 3)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-get--storage125992234--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-get--storage125992234--input186507116-.out
index 557d460e32841d18d07242233c0150c055fcac4e..72904fc34368eb842a0157b5f4e77168d51807ac 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-get--storage125992234--input186507116-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-get--storage125992234--input186507116-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-get.tz on storage Unit and input '(Pair 1 4 2 Unit)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-get.tz on storage Unit and input '(Pair 1 4 2 Unit)' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set--storage186507116--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set--storage186507116--input125992234-.out
index 1fd12a499e26876d661cd52a15dd04da91cd64a9..31e00ccfac2180a30322b5447aac6ca8a9caf064 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set--storage186507116--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set--storage186507116--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-set.tz on storage '(Pair 1 4 2 Unit)' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-set.tz on storage '(Pair 1 4 2 Unit)' and input Unit --level 1 --trace-stack
 storage
   (Pair 2 12 8 Unit)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set-2--storage921624073--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set-2--storage921624073--input186507116-.out
index 104f113cd2187f704a4cfae474fb586bb6857ac0..7b79e04e42459349b428d167f7f543353484e3fc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set-2--storage921624073--input186507116-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comb-set-2--storage921624073--input186507116-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-set-2.tz on storage None and input '(Pair 1 4 2 Unit)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comb-set-2.tz on storage None and input '(Pair 1 4 2 Unit)' --level 1 --trace-stack
 storage
   (Some (Pair 2 4 "toto" 0x01))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -compare--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -compare--storage125992234--input125992234-.out
index cf614ca1438ff26e8848073f9c76faf9f075cb97..fca14a8ea02deb38019ccca537a98a8195ba42c1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -compare--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -compare--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/compare.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/compare.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comparisons--storage457300675--input281780712-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comparisons--storage457300675--input281780712-.out
index 967af5d3b5662fd9c772ec1ebc51ae381c692755..3e755b67a17ee6933d8b8866633910f0480ab6b3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comparisons--storage457300675--input281780712-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -comparisons--storage457300675--input281780712-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comparisons.tz on storage '{}' and input '{ -9999999; -1 ; 0 ; 1 ; 9999999 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/comparisons.tz on storage '{}' and input '{ -9999999; -1 ; 0 ; 1 ; 9999999 }' --level 1 --trace-stack
 storage
   { { False ; False ; False ; True ; True } ;
     { False ; False ; True ; True ; True } ;
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input392583650-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input392583650-.out
index 1aac98fcae6a20164edc97a032d49f4abdadd3c7..048de49e4be05a0b0642777ca26a9cbdcb565037 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input392583650-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input392583650-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{ "test1" ; "test2" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{ "test1" ; "test2" }' --level 1 --trace-stack
 storage
   { "Hello test1" ; "Hello test2" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input457300675-.out
index c9e0f0d60d1b01beefc3666560c8dd226db0f82a..5e3cb4336ecdd0ae438d18a3635ba289b2f9a41a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input640104625-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input640104625-.out
index 1beec0ed5c0773a4fa2dadb316a5fca261bd1579..9a2ad231706193916b78f52c5fb8aadbb79522cd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input640104625-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello--storage457300675--input640104625-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{ "World!" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello.tz on storage '{}' and input '{ "World!" }' --level 1 --trace-stack
 storage
   { "Hello World!" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input354091714-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input354091714-.out
index c7c33b80c794287743b572077874f48011c5680c..024e2c35bf77482cdb819166c05efc7693964ece 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input354091714-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input354091714-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{ 0xab ; 0xcd }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{ 0xab ; 0xcd }' --level 1 --trace-stack
 storage
   { 0xffab ; 0xffcd }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input441061063-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input441061063-.out
index 1e3273bbbe0dcba8d3b496b4ed8c538518b93fe4..a95978396046f8898e3316f581a202565615780d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input441061063-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input441061063-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{ 0xcd }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{ 0xcd }' --level 1 --trace-stack
 storage
   { 0xffcd }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input457300675-.out
index 98ffaee8e2b8540f3af2d7b424e174cbd4cebb61..c02c8cbfb47f8dcad5e6d747c74351f198c3fc7b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_hello_bytes--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_hello_bytes.tz on storage '{}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input264787654-.out
index 93ccfe41237b274f46b3bd8f422e62a9ce64fd50..440ea7e2b485444b8fff9246842a3e55a618bfe3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
 storage
   "abc"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input316676251-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input316676251-.out
index 6277d8e913e102a2f79e30c10a3ba86478de084c..760514db5d22d54f58e214bb666e66a33f6734f0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input316676251-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input316676251-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{ "Hello" ; " " ; "World" ; "!" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{ "Hello" ; " " ; "World" ; "!" }' --level 1 --trace-stack
 storage
   "Hello World!"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input457300675-.out
index 0f1e9e9604523155d46bbd4419b5af15eef8b4f8..613598e2a3d66e6e148d2477ccb704172528073a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -concat_list--storage79230375--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/concat_list.tz on storage '""' and input '{}' --level 1 --trace-stack
 storage
   ""
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage457300675--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage457300675--input798141440-.out
index 6ca2e8506de9e0d05a22388aa6eb103d23bf2eb4..ea196613f1f8004ef34a9cc1d01ee59c72d52215 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage457300675--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage457300675--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{}' and input 10 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{}' and input 10 --level 1 --trace-stack
 storage
   { 10 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage581876226--input166122047-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage581876226--input166122047-.out
index 83c29f10c0229e3c1ad267586c389e8e16d896e7..e2d1487a57c2c4e0940569915ef1dcd9a8fb079f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage581876226--input166122047-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage581876226--input166122047-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{ 10 }' and input -5 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{ 10 }' and input -5 --level 1 --trace-stack
 storage
   { -5 ; 10 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage793461282--input781487591-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage793461282--input781487591-.out
index fd15660f19792972f38cb99d3cf5666f49544172..972320b941cb943e40ae0b34ea59158bfe576bcf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage793461282--input781487591-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -cons--storage793461282--input781487591-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{ -5 ; 10 }' and input 99 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/cons.tz on storage '{ -5 ; 10 }' and input 99 --level 1 --trace-stack
 storage
   { 99 ; -5 ; 10 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input315650912-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input315650912-.out
index b8c94d4574d86e7debf6680e226e97558d682714..67e17c04267451b82c762629e25ce427ec0fa405 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input315650912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input315650912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" } { "B" })' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" } { "B" })' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input51111414-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input51111414-.out
index effe1d2a716774e5808dc270348669cfd34bc78a..982bab9744d803130b5dfc7914cf746da7254bf4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input51111414-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input51111414-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input545734274-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input545734274-.out
index 68c3ef88e3f5fcbd7e808207bc73fd47607d732b..6bfff252219108651d97a64d2083d3d8d02af291 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input545734274-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input545734274-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "A" } { "B" })' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "A" } { "B" })' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input772794967-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input772794967-.out
index f0b58ab1936f022fc6db40b1852a1a0bc0b46469..f9207978bc809963a392530caedd87b27c8a34f5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input772794967-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input772794967-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair {} {})' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair {} {})' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input917967660-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input917967660-.out
index 0f3fcc2c7f50283745bfdb4bf8f14aff8d13c69a..20a2091d33809e1d3d60386953264827d65abea0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input917967660-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input917967660-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input964818218-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input964818218-.out
index 303a54cd0818ec7c35b8f9740b99517003970e5a..6628e769d74d874203b282933cc026dbae83ed93 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input964818218-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contains_all--storage921624073--input964818218-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "c" } { "B" })' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contains_all.tz on storage None and input '(Pair { "c" } { "B" })' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contract--storage125992234--input117475800-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contract--storage125992234--input117475800-.out
index 553b08cc1c4d04a368b38bd0832ece7877a0f643..a318e19eac87a5bb2971960425071c463b41a0b9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contract--storage125992234--input117475800-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -contract--storage125992234--input117475800-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contract.tz on storage Unit and input '"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/contract.tz on storage Unit and input '"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -create_contract--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -create_contract--storage921624073--input125992234-.out
index 19a2b4566bf6a921c3cf7aa3f7f0bd9a80c9f9b4..e2477d0a4ef1202eb3f6d52336358569aa34f475 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -create_contract--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -create_contract--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/create_contract.tz on storage None and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/create_contract.tz on storage None and input Unit --level 1 --trace-stack
 storage
   (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1011138251-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1011138251-.out
index 6d8c0f3a4c9a966342b133cbe48d9845bc234bd3..a6e8307553bb2cc46999d313ae354b20d2ac0ccf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1011138251-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1011138251-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 0 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 0 0)' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1018564342-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1018564342-.out
index ad89be95e61623d85c8e8061e15e2b8257ada747..75c067e52423a28b00c6677d8e8dc44b91144da2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1018564342-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1018564342-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 0 1)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 0 1)' --level 1 --trace-stack
 storage
   -1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1031049988-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1031049988-.out
index 44ad177c354226bf9363d5488cf400adaf74f0d6..f7bb025b223e8a74a8c62499c005f34fa40afef9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1031049988-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input1031049988-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")' --level 1 --trace-stack
 storage
   200
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input685590443-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input685590443-.out
index 4afcd858d1f36ceb788502441e3571979b3f1e61..37ce14299b8797843aa1d3721c90d3962de8a1ad 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input685590443-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -diff_timestamps--storage492856247--input685590443-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 1 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/diff_timestamps.tz on storage 111 and input '(Pair 1 0)' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input246866101-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input246866101-.out
index 5f414a482ab7e9ad85de31cd129b1dfd9d0852f6..2601ffe0b019feab551c42bce8ee40a8579d2d0a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input246866101-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input246866101-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dig_eq.tz on storage Unit and input '(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pair 13 (Pair 12 (Pair 11 (Pair 10 (Pair 9 (Pair 8 (Pair 7 (Pair 6 (Pair 5 (Pair 4 (Pair 3 (Pair 2 1))))))))))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dig_eq.tz on storage Unit and input '(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pair 13 (Pair 12 (Pair 11 (Pair 10 (Pair 9 (Pair 8 (Pair 7 (Pair 6 (Pair 5 (Pair 4 (Pair 3 (Pair 2 1))))))))))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input26856104-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input26856104-.out
index db4f9ba9cd8a9471b43a1f1e5e2f320748e556d5..fbaed095144aab0b960b518b44f069c216433484 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input26856104-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dig_eq--storage125992234--input26856104-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dig_eq.tz on storage Unit and input '(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair 10 (Pair 14 (Pair 19 (Pair 9 (Pair 18 (Pair 6 (Pair 8 (Pair 11 (Pair 4 (Pair 13 (Pair 15 (Pair 5 1))))))))))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dig_eq.tz on storage Unit and input '(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair 10 (Pair 14 (Pair 19 (Pair 9 (Pair 18 (Pair 6 (Pair 8 (Pair 11 (Pair 4 (Pair 13 (Pair 15 (Pair 5 1))))))))))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dign--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dign--storage680650890--input529388602-.out
index 128f64b6510d817d42cc0890651647eee8e91497..3cad3f221277fbfe22a9f9fe58cc09bffc960727 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dign--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dign--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dign.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dign.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
 storage
   5
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input590117173-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input590117173-.out
index 0dd2246fba283bad27b278b49f3266c4c1eb0d77..d78720c4d0cf5c5346984443b96533799b77d4ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input590117173-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input590117173-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dip.tz on storage '(Pair 0 0)' and input '(Pair 1 1)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dip.tz on storage '(Pair 0 0)' and input '(Pair 1 1)' --level 1 --trace-stack
 storage
   (Pair 1 2)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input850887554-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input850887554-.out
index 3c678160475ca1969129cca052778debea0838f7..3f93faebb2a4791f86a5c84e1d7064f163ec9ccc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input850887554-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dip--storage1011138251--input850887554-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dip.tz on storage '(Pair 0 0)' and input '(Pair 15 9)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dip.tz on storage '(Pair 0 0)' and input '(Pair 15 9)' --level 1 --trace-stack
 storage
   (Pair 15 24)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dipn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dipn--storage680650890--input529388602-.out
index c003d1dcc48397e23139ec43deebda8b1890cebf..c11459566da7f2571dcd3afabd9b8a3d108dae04 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dipn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dipn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dipn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dipn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
 storage
   6
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dropn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dropn--storage680650890--input529388602-.out
index b148daef410fa84418430586959dfcbd85522cf2..dedb07de1766afcec837d59142d6be3e960b9c22 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dropn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dropn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dropn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dropn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
 storage
   5
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dugn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dugn--storage680650890--input529388602-.out
index ce7459bb540fe1c9977eb46edac6b709aed89faf..61ada84ce027a82d02535d91ecd2a5a3cc8d9587 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dugn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dugn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dugn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dugn.tz on storage 0 and input '(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dup-n--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dup-n--storage125992234--input125992234-.out
index 05da9a36171bc81b1af3da0f363d1c48e1d5b859..a220c5085ce5a2335548eea4b8aefb3c7ff01ba5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dup-n--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -dup-n--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dup-n.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/dup-n.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input247451205-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input247451205-.out
index 6e942cbd96d30466307c6434fcf626e774a88b22..684d5b02c22fad398a40a6aaf7444aad0803015d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input247451205-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input247451205-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair 10 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair 10 0)' --level 1 --trace-stack
 storage
   (Pair None None None None)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input250545589-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input250545589-.out
index b2b23044c21e365ea09096c703c7fca1cbef282a..618978a638794963717468f1add6dba072b8a9a7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input250545589-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input250545589-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair -8 2)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair -8 2)' --level 1 --trace-stack
 storage
   (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input79625541-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input79625541-.out
index 94fc04ead1dbab12a2b5400c553c6117d39482dd..1ea33c83724815d34a58c668bc21521fb027c61b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input79625541-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv--storage994417987--input79625541-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair 10 -3)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv.tz on storage '(Pair None None None None)' and input '(Pair 10 -3)' --level 1 --trace-stack
 storage
   (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input147133089-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input147133089-.out
index ff41e0094671538840f80a8cb9a474028cf843f6..269092e482c8e22baad8ec77ca71ffd6e284e467 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input147133089-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input147133089-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 0))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 0))' --level 1 --trace-stack
 storage
   (Right None)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input215785357-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input215785357-.out
index 106af38515fad0258adf262ca7a95b2b53ea3beb..07bfe1bb9e0535a52b182dae35f564a2cc757f40 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input215785357-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input215785357-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 3))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 3))' --level 1 --trace-stack
 storage
   (Right (Some (Pair 3 1)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input389351431-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input389351431-.out
index a81a21c387554e44b93bbdf0a6bc4ac9a198a47c..29d8c4e55cfe05031674bc3ac2dbe100862c9de1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input389351431-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input389351431-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 10))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 10))' --level 1 --trace-stack
 storage
   (Left (Some (Pair 1 0)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input44513000-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input44513000-.out
index cc4cfe712312a129dc9d70bc6b579d652d966fea..d83534a4b0c15818976eb5e70331911f8119741a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input44513000-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input44513000-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 0))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 0))' --level 1 --trace-stack
 storage
   (Left None)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input635398196-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input635398196-.out
index b45b2995a92bd52b12dbfa90e71bcdcc8730ab56..51f9eb7d04f02d20c3d5c0cfad412a7ef052ed2f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input635398196-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input635398196-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 3))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Left 3))' --level 1 --trace-stack
 storage
   (Left (Some (Pair 3 1)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input734264738-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input734264738-.out
index 5b0ba43f82349504c9de069d6d0011f7fe9fc11f..160b4f4b74aac64e46403380929238fdc30cd058 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input734264738-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input734264738-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 10))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 10 (Right 10))' --level 1 --trace-stack
 storage
   (Right (Some (Pair 1 0)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input993071382-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input993071382-.out
index 6bf845af113b4719bf168facaeb5a40aeeff309e..cdc9dafaa76110c2a147430ade13b46f1c468af0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input993071382-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ediv_mutez--storage977883604--input993071382-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 5 (Right 10))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ediv_mutez.tz on storage '(Left None)' and input '(Pair 5 (Right 10))' --level 1 --trace-stack
 storage
   (Right (Some (Pair 0 5)))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -emit--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -emit--storage125992234--input125992234-.out
index ff8baf26f34a1082d0cd62b38a095e10b4ea9caf..bd7e141318390d7c8b5ecf153b548b5a017405e9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -emit--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -emit--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/emit.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/emit.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -empty_map--storage457300675--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -empty_map--storage457300675--input125992234-.out
index ede7eff091668eac8f55e1be5fbc46b989897f50..c542213e6d2a92854648acdbf6f923045dae3442 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -empty_map--storage457300675--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -empty_map--storage457300675--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/empty_map.tz on storage '{}' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/empty_map.tz on storage '{}' and input Unit --level 1 --trace-stack
 storage
   { Elt "hello" "world" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input246262487-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input246262487-.out
index 0a3a6396c7bf99a7a235352b545d2b401e5b81ec..ebaad6726fca4f4dd62e100efed76adbea6db531 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input246262487-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input246262487-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/exec_concat.tz on storage '"?"' and input '"test"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/exec_concat.tz on storage '"?"' and input '"test"' --level 1 --trace-stack
 storage
   "test_abc"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input79230375-.out
index ad2977b44c3a52d5a7498ecfa283597d9e737ac6..332f62cd5e82d25cb76e0e43cf59ea72bb9d1fda 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -exec_concat--storage398998998--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/exec_concat.tz on storage '"?"' and input '""' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/exec_concat.tz on storage '"?"' and input '""' --level 1 --trace-stack
 storage
   "_abc"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input478406404-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input478406404-.out
index 2f8d170a407a41f84b06e87b2b65aad136a003a1..99386e5ba1221ca522bd9fbc6df538ee293aee33 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input478406404-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input478406404-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/first.tz on storage 111 and input '{ 4 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/first.tz on storage 111 and input '{ 4 }' --level 1 --trace-stack
 storage
   4
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input962874972-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input962874972-.out
index 7217c3054c0678e180891bf99f38d749d210d324..c67a22ab348a9f49c330245d0b8c2d0c92581525 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input962874972-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -first--storage492856247--input962874972-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/first.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/first.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 }' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage1026405794--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage1026405794--input329240220-.out
index cc28e9b5429459117e883c20ed09df376470b19b..c1fb2a147e1d9c17f64d72da75e9822881014f90 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "hello" 4 })' and input '"hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "hello" 4 })' and input '"hello"' --level 1 --trace-stack
 storage
   (Pair (Some 4) {})
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage382368661--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage382368661--input329240220-.out
index b513feae177b1081ad5742f95cdae06e8e9089c9..12400afa2e02b10353f4db1604b890f5424e75db 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage382368661--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage382368661--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 4) {})' and input '"hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 4) {})' and input '"hello"' --level 1 --trace-stack
 storage
   (Pair None { Elt "hello" 4 })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input329240220-.out
index 6566bbcc8a43cdbcf640856a643906cf1485e596..21e2dfa8f5f1f75160c88b6df80a7aed6ebb13b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 5) { Elt "hello" 4 })' and input '"hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 5) { Elt "hello" 4 })' and input '"hello"' --level 1 --trace-stack
 storage
   (Pair (Some 4) { Elt "hello" 5 })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input507231566-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input507231566-.out
index 5d3eaeca6527c0c75b4423e1a7158b7980e135e5..941a9e6ac546f6600a60d282ab6aed715385b9bc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input507231566-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage496578814--input507231566-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 5) { Elt "hello" 4 })' and input '"hi"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair (Some 5) { Elt "hello" 4 })' and input '"hi"' --level 1 --trace-stack
 storage
   (Pair None { Elt "hello" 4 ; Elt "hi" 5 })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage547821324--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage547821324--input329240220-.out
index d330dda0d6ce09672b10f915b5da0ff4aaae9718..8cc28a7468b63bc3d3a3ad1ebe93455fbe3e48f3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage547821324--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage547821324--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None {})' and input '"hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None {})' and input '"hello"' --level 1 --trace-stack
 storage
   (Pair None {})
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input156280093-.out
index 0a511928fd16b5580afe6f6a1f79cb134d2f0453..8ea86a1b40f30a3be48fb164abf5a87502c2bd4d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input156280093-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "1" 1 ; Elt "2" 2 })' and input '"1"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "1" 1 ; Elt "2" 2 })' and input '"1"' --level 1 --trace-stack
 storage
   (Pair (Some 1) { Elt "2" 2 })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input228164856-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input228164856-.out
index 470fdb0060fe7f8e47b9adbb5f7ac8dfcdd5d101..010c9df5450c24a11bd51ca7bf9aff117d85351b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input228164856-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_and_update_map--storage796012494--input228164856-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "1" 1 ; Elt "2" 2 })' and input '"2"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_and_update_map.tz on storage '(Pair None { Elt "1" 1 ; Elt "2" 2 })' and input '"2"' --level 1 --trace-stack
 storage
   (Pair (Some 2) { Elt "1" 1 })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input329240220-.out
index 4213417efd35d5f31aa9766476cf5541cc175b25..e04b98b03c4e1ffaf40bf2c253e94d18b39536c6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "hello" "hi" })' and input '"hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "hello" "hi" })' and input '"hello"' --level 1 --trace-stack
 storage
   (Pair (Some "hi") { Elt "hello" "hi" })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input79230375-.out
index d42cf2a52bec837619dc5ced5b899898b392d15e..2cd759e2d067ec92eb00662ca05816acc85a2427 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage139236239--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "hello" "hi" })' and input '""' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "hello" "hi" })' and input '""' --level 1 --trace-stack
 storage
   (Pair None { Elt "hello" "hi" })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage329396864--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage329396864--input156280093-.out
index 064382f09970107424d909f9b818b5eb3833358c..5fb1caf5705004591bfa6509607ca9afe3572f92 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage329396864--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -get_map_value--storage329396864--input156280093-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "1" "one" ; Elt "2" "two" })' and input '"1"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/get_map_value.tz on storage '(Pair None { Elt "1" "one" ; Elt "2" "two" })' and input '"1"' --level 1 --trace-stack
 storage
   (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" })
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input1040351577-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input1040351577-.out
index 66a9c819ac55d3fad615e7b2685163cc97850981..a5dba6f6fab8e581a8f9c273648edbab5fc639ce 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input1040351577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input1040351577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_key.tz on storage None and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_key.tz on storage None and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' --level 1 --trace-stack
 storage
   (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input153350004-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input153350004-.out
index 63842546a3b34f923d84c01562e3867f17d1dba9..0d18aaf4c3e604b4fc1d7834d68349c373a924c3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input153350004-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_key--storage921624073--input153350004-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_key.tz on storage None and input '"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_key.tz on storage None and input '"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES"' --level 1 --trace-stack
 storage
   (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input3431716-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input3431716-.out
index b4c33ad849a1e7fcd46fab554b32d43c2cb28aa2..c9329ca8ff01e23062cec1aaf27855c1244da006 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input3431716-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input3431716-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_string.tz on storage 0x00 and input '"abcdefg"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_string.tz on storage 0x00 and input '"abcdefg"' --level 1 --trace-stack
 storage
   0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input535018041-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input535018041-.out
index 35bd92d84bb9eb8e8120652e2a395bbf64b71aa0..42a77fe27144c7ad0806b967c16f84e0685c2c8c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input535018041-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -hash_string--storage151303925--input535018041-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_string.tz on storage 0x00 and input '"12345"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/hash_string.tz on storage 0x00 and input '"12345"' --level 1 --trace-stack
 storage
   0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input570553153-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input570553153-.out
index 6cedb7d5d5333dc606d43c1b33e8b92863d71795..12a988050dc847318e9e4a8bf09f2912e0dffb65 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input570553153-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input570553153-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if.tz on storage None and input False --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if.tz on storage None and input False --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input954397288-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input954397288-.out
index bca340c23cd4ab7b2d527ba862f76945ab053725..6af21244039b45045234fbe1c65e69f6d42b9f10 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input954397288-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if--storage921624073--input954397288-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if.tz on storage None and input True --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if.tz on storage None and input True --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input288201633-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input288201633-.out
index 01fb41dfb161884a77e26771685e1bafc176e0f9..be5d6597ebd8bdde9f524618ee0beac2c4bedecf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input288201633-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input288201633-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if_some.tz on storage '"?"' and input '(Some "hello")' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if_some.tz on storage '"?"' and input '(Some "hello")' --level 1 --trace-stack
 storage
   "hello"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input921624073-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input921624073-.out
index 4824af419c333fad58677b495eac9f18f8fbfe2a..4671241fbc20c59aac95f42c2087976c1bf0e307 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input921624073-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -if_some--storage398998998--input921624073-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if_some.tz on storage '"?"' and input None --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/if_some.tz on storage '"?"' and input None --level 1 --trace-stack
 storage
   ""
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input453441034-.out
index eacc90a5ee6fe154ad0aff452a15f758d101309d..1d04ab80498e92b41b5cb78d7f67add552d2831c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 1 --level 1 --trace-stack
 storage
   (Some 1)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input535454136-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input535454136-.out
index 9e9dc55b42d913317cfc5717fcb63f6f3ccfae9d..eeb9db3469d107d87302a287e79e960bb953d4c5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input535454136-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input535454136-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 9999 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 9999 --level 1 --trace-stack
 storage
   (Some 9999)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input680650890-.out
index 9825211d57497975eb1281fc8a6924666dc04aa9..306db1d381c6b5e21e848a0a39f98a356efffa6d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -int--storage921624073--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 0 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/int.tz on storage None and input 0 --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -keccak--storage921624073--input1008262038-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -keccak--storage921624073--input1008262038-.out
index 1eee51a1988d715c2fc5911722ee70c944b39978..69ad4185e59df751fdb2938f9b90ee2c50806dd3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -keccak--storage921624073--input1008262038-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -keccak--storage921624073--input1008262038-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/keccak.tz on storage None and input 0x48656c6c6f2c20776f726c6421 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/keccak.tz on storage None and input 0x48656c6c6f2c20776f726c6421 --level 1 --trace-stack
 storage
   (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input202098045-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input202098045-.out
index 72d4c26915c71991a0991525301e5ac3ce017e63..5e5587b086355f49002f68041ae3d8c8fb3063a7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input202098045-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input202098045-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/left_right.tz on storage '(Left "X")' and input '(Left True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/left_right.tz on storage '(Left "X")' and input '(Left True)' --level 1 --trace-stack
 storage
   (Right True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input44576556-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input44576556-.out
index 03f648aa8b3f3dd314a7e0467b9ecfd1ed80006d..413e9e8d560bf52e5781f4bcd99d9456c381735a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input44576556-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -left_right--storage4177631--input44576556-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/left_right.tz on storage '(Left "X")' and input '(Right "a")' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/left_right.tz on storage '(Left "X")' and input '(Right "a")' --level 1 --trace-stack
 storage
   (Left "a")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -level--storage492856247--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -level--storage492856247--input125992234-.out
index 916ad5b1142a6ab7e9ec4c863192e0f6ac27747e..a82ec25b0d8d57f061c627757ef205a352a76a12 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -level--storage492856247--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -level--storage492856247--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/level.tz on storage 111 and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/level.tz on storage 111 and input Unit --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input457300675-.out
index de31d6667dbd0b9f3b5aa332105ba0ff9eea73ca..826bdb9b232ea423b12c439ef9610e549d327db2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat.tz on storage '"abc"' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat.tz on storage '"abc"' and input '{}' --level 1 --trace-stack
 storage
   "abc"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input546523343-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input546523343-.out
index bfd7c35a3cbb7577540096c05e245a274fbaf6e5..12edcf42774564d084215df94212d8604f557e42 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input546523343-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat--storage717096222--input546523343-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat.tz on storage '"abc"' and input '{ "d" ; "e" ; "f" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat.tz on storage '"abc"' and input '{ "d" ; "e" ; "f" }' --level 1 --trace-stack
 storage
   "abcdef"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input220724351-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input220724351-.out
index 3d57f4a7f3f6f12c6ce206b7cd2714b561cb3e7e..44cedb8c6ad573b7efc365471ea075947a30715b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input220724351-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input220724351-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x and input '{ 0x00 ; 0x11 ; 0x00 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x and input '{ 0x00 ; 0x11 ; 0x00 }' --level 1 --trace-stack
 storage
   0x001100
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input457300675-.out
index 029201cdc4804a7949263967e114aae9129013be..84bd826f6afb271f288242bfb92fce27369ceef3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage149262694--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x and input '{}' --level 1 --trace-stack
 storage
   0x
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage65410082--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage65410082--input457300675-.out
index 624bbdc75357a898c2c49ab4b9d1e219cc2e1188..9edd5de3012eda137ab45f1e06f9f9b3aad945a4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage65410082--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage65410082--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0xabcd and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0xabcd and input '{}' --level 1 --trace-stack
 storage
   0xabcd
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage726220441--input972761363-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage726220441--input972761363-.out
index f2baf34804dba49b4a714d6b9320895780ad69be..a20d43970e4028334755e49feb4cedd479e52aa0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage726220441--input972761363-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_concat_bytes--storage726220441--input972761363-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x00ab and input '{ 0xcd ; 0xef ; 0x00 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_concat_bytes.tz on storage 0x00ab and input '{ 0xcd ; 0xef ; 0x00 }' --level 1 --trace-stack
 storage
   0x00abcdef00
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input264787654-.out
index fd555092cbaec8d83557dbe8c04dab10bf17bc7e..773b4ec95f9eab2d888a055e058df16cddaf614a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input457300675-.out
index 8ac80734bb7d3a925e41804eb9edf007aef055f4..c7984d79eb1d18c6b901bb102c9fa31bd78ad636 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input656499821-.out
index a5a4b687031b8c8ba4bf716f8910b4222d9ef626..b4709b045a4d3d39dc2176a8942107535daa26f3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id--storage528921618--input656499821-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{ "1" ; "2" ; "3" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id.tz on storage '{""}' and input '{ "1" ; "2" ; "3" }' --level 1 --trace-stack
 storage
   { "1" ; "2" ; "3" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input264787654-.out
index 762af48f1922663d0aa6db9499882cb6c59d984a..4b3a5cbb8bb6789f7aa2e0a3e90bc330a78a75b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input457300675-.out
index b88bdbb3ca075734d421488647cfc80715e265ee..b7b8b2466b304b2e217fa98714a2443f2cc7e481 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input656499821-.out
index 1c0ebe8ab3511e3c136bee48e8f72e5374b98ca5..4ec0a2f975f94d2b2c610bca51c1c91830c005c4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_id_map--storage528921618--input656499821-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{ "1" ; "2" ; "3" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_id_map.tz on storage '{""}' and input '{ "1" ; "2" ; "3" }' --level 1 --trace-stack
 storage
   { "1" ; "2" ; "3" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input568817463-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input568817463-.out
index e5e7881a40b7a0ea826f0cb8fb83fd492400c9e5..4cf2d0614dc914a65b6b16772181cec36fa3a373 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input568817463-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input568817463-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_iter.tz on storage 0 and input '{ 10 ; 2 ; 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_iter.tz on storage 0 and input '{ 10 ; 2 ; 1 }' --level 1 --trace-stack
 storage
   20
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input737923774-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input737923774-.out
index 0eedfeed16f5f79abec2ba8282163d270fe393aa..8f494d196843bc49e28b7c472abd78c7b0775eb6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input737923774-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_iter--storage680650890--input737923774-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_iter.tz on storage 0 and input '{ 3 ; 6 ; 9 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_iter.tz on storage 0 and input '{ 3 ; 6 ; 9 }' --level 1 --trace-stack
 storage
   162
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input457300675-.out
index dbb76e4762f4f022ca3a519595021ea6e199d46f..e036c0332fe1f608a695a29b50c512a5a1127eb5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input648737279-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input648737279-.out
index 78f250fbd726080d1f7bdb845c34627dca0a1d5a..edb6f201e0f7d839780e591055203d6ab2e94118 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input648737279-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input648737279-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{ 1 ; 2 ; 3 ; 0 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{ 1 ; 2 ; 3 ; 0 }' --level 1 --trace-stack
 storage
   { 1 ; 3 ; 5 ; 3 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input908379154-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input908379154-.out
index f8a363f7d3bc555b3bcf50efb5b51756b1096354..6e12034caa713c5da0e16ab0c47792291d7a3670 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input908379154-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_map_block--storage907453363--input908379154-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{ 1 ; 1 ; 1 ; 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_map_block.tz on storage '{0}' and input '{ 1 ; 1 ; 1 ; 1 }' --level 1 --trace-stack
 storage
   { 1 ; 2 ; 3 ; 4 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input403499055-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input403499055-.out
index d28608ba33b615f3f806e4a006984228fb5b4d79..0db363e3aeb60a85e300aa08e4a09682288e8f26 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input403499055-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input403499055-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' --level 1 --trace-stack
 storage
   6
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input457300675-.out
index 525c06353c842ea23e423fd3ffcf6ee63e37f176..1fbe4584c10b95c049e05d923d6d36bd4a4c6994 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{}' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input469078912-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input469078912-.out
index 2b4f0aafb059f1ea195ce94f78cdc2e284d56ece..f2df0559071bb6b610bf4028836a628c2116fa9f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input469078912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input469078912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 ; 2 ; 3 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 ; 2 ; 3 }' --level 1 --trace-stack
 storage
   3
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input802622031-.out
index 23b622507cd7ecdf24b3adcfbb8d1f29256281df..79b7c361fd2a67865ea0dd70adf82ec2d33dbe02 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -list_size--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/list_size.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input457300675-.out
index 6f84f66fbb413e0ad359f843a3790123fbf4afff..36aa3d55b1f2ff3e6d85479e60f2daca24ef82a6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/loop_left.tz on storage '{""}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/loop_left.tz on storage '{""}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input851203613-.out
index 53f862d4a4a5fe5f22aa1cd0ccf19d4aadf965e2..dea1711d53ad5d92ea13a77a1b419024c0b2dcd1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -loop_left--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/loop_left.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/loop_left.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsl_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsl_bytes--storage125992234--input125992234-.out
index 779bfb39a5cfa8b3b7a466992bc72e16693fd505..0f1d3a06e3647be565c81ae20606a6be7c4fb838 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsl_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsl_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/lsl_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/lsl_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsr_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsr_bytes--storage125992234--input125992234-.out
index 8e4e7c82c55fffa8161c098430d55b1ae6f42195..ea4e590d3c5ef6e67e09a89e5dc9b1ca6c4ab770 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsr_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -lsr_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/lsr_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/lsr_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input1027566226-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input1027566226-.out
index f245c60d449d5ef0a74275b5c22f80a54ef62558..9d24a52f70c1f705b55e99c76712f52e578a2722 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input1027566226-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input1027566226-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 0 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 0 }' --level 1 --trace-stack
 storage
   { Elt 0 0 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input276660554-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input276660554-.out
index 6669663012ee184b1b6327f5a9941621db93ab10..687e9454579aae7f4ad56f912bd1ac525a08585b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input276660554-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input276660554-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 0 ; Elt 3 4 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 0 ; Elt 3 4 }' --level 1 --trace-stack
 storage
   { Elt 0 0 ; Elt 3 4 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input599923743-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input599923743-.out
index 8c1e7ceb37a80a35d288702cb7cf3eabe653379a..4a55beaf40a0005fac24e9db51750b76e83e649f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input599923743-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_id--storage457300675--input599923743-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_id.tz on storage '{}' and input '{ Elt 0 1 }' --level 1 --trace-stack
 storage
   { Elt 0 1 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input403579222-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input403579222-.out
index 7b32482d3e3a28038fc08afcd8ae94d8b57eb038..e8d52eeba56531629369da2e15815c6b5e20d286 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input403579222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input403579222-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_iter.tz on storage '(Pair 0 0)' and input '{ Elt 1 1 ; Elt 2 100 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_iter.tz on storage '(Pair 0 0)' and input '{ Elt 1 1 ; Elt 2 100 }' --level 1 --trace-stack
 storage
   (Pair 3 101)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input532072758-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input532072758-.out
index 76858acff0da8d414ee10b1cc6bae0562ffc0694..9e390072bf415dece01d1018f856d5900e5ecae4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input532072758-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_iter--storage1011138251--input532072758-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_iter.tz on storage '(Pair 0 0)' and input '{ Elt 0 100 ; Elt 2 100 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_iter.tz on storage '(Pair 0 0)' and input '{ Elt 0 100 ; Elt 2 100 }' --level 1 --trace-stack
 storage
   (Pair 2 200)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage457300675--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage457300675--input798141440-.out
index b38ae07aa5a4df214ed9c1f3ae5dbb7224aea286..905de4c0d5a9f99b796f202f426409f1c10d203a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage457300675--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage457300675--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{}' and input 10 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{}' and input 10 --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage794999348--input152441147-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage794999348--input152441147-.out
index e247fabd2d52141b1c7707a0cc6fee0910db89cc..4675609cf930273f047364f5548f3a3f0cef9bdf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage794999348--input152441147-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage794999348--input152441147-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{ Elt "bar" 5 ; Elt "foo" 1 }' and input 15 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{ Elt "bar" 5 ; Elt "foo" 1 }' and input 15 --level 1 --trace-stack
 storage
   { Elt "bar" 20 ; Elt "foo" 16 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage88008216--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage88008216--input798141440-.out
index 49336270633c418469bb612784fac5623b3a648d..cccca06c563335d652b5b6bb260dc2c0db480042 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage88008216--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_map--storage88008216--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{ Elt "foo" 1 }' and input 10 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_map.tz on storage '{ Elt "foo" 1 }' and input 10 --level 1 --trace-stack
 storage
   { Elt "foo" 11 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage495706788--input453441034-.out
index 908c8b12321cc6f93b31af5bd3c392220f7257ef..81da55e64fe10bd250d9a82b9edcd5509cdbd70b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage495706788--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair {} None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair {} None)' and input 1 --level 1 --trace-stack
 storage
   (Pair {} (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input453441034-.out
index c190b5da71ad8154aa10a036d9f62cd210f0f387..5caaf06afc64ea3dc2f3ccf832ddae8d2c85dc82 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair { Elt 1 4 ; Elt 2 11 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input564400327-.out
index e37ad900d61d969224fc5d6ba4f6ea28b3aa8158..026326cb023a48f9c2d9fa71a88f5084a66d9969 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 2 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 2 --level 1 --trace-stack
 storage
   (Pair { Elt 1 4 ; Elt 2 11 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input654274102-.out
index 7b023524853de36e696b5f59840ac394f0c1a761..9724080b2b18c15717b45b14f7d8cf3c2dd62be2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage56274299--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 3 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 4 ; Elt 2 11 } None)' and input 3 --level 1 --trace-stack
 storage
   (Pair { Elt 1 4 ; Elt 2 11 } (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage690637660--input453441034-.out
index 2d559388a7f5c0166e4e0b19336dd2ac36abc0ff..5a1f9143d0d168f639f5a8cfcfa48ffa1abba5b6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage690637660--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 0 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 1 0 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair { Elt 1 0 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage806237530--input453441034-.out
index 0936efd3a1862e54ed047b1a7d6e1b2b08e0102e..300efe5afa8daa042c67d0e8c57a6eaaa7174e44 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_nat--storage806237530--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 0 1 } None)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_nat.tz on storage '(Pair { Elt 0 1 } None)' and input 1 --level 1 --trace-stack
 storage
   (Pair { Elt 0 1 } (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input1071610051-.out
index 57e336c4e653198b008ea39026286c7b4803bbcb..86cb3958a9458119d39229950185dcd56c8f1b62 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input1071610051-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"baz"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"baz"' --level 1 --trace-stack
 storage
   (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input700475845-.out
index 5e1ef1e60e3bc30a10365a6a6a9bedc99f4fa366..f00af9201224795c94001c99679517e576053ead 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input905318451-.out
index 7ff5e20f91e9182c179c1f1ba1bbeab1c12e2c0f..c856d11bb2d745b628917d712cf502345c627bd8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage109689253--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"foo"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "bar" 4 ; Elt "foo" 11 } None)' and input '"foo"' --level 1 --trace-stack
 storage
   (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage495706788--input700475845-.out
index 0712879daf0c02d01df603f47ad6ed541067e6b5..e02be5b7684da71a566976d74d91f1434ab2d901 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage495706788--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair {} None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair {} None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair {} (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage915708427--input700475845-.out
index 8c4e7d0a7902c80dcdc8fd4957ffdbdb0f742614..549eab8a7d41766dbd456d1632b76fcfa2759d2f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage915708427--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "foo" 1 } None)' and input '"bar"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "foo" 1 } None)' and input '"bar"' --level 1 --trace-stack
 storage
   (Pair { Elt "foo" 1 } (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage936682951--input905318451-.out
index 6f9f738ba90958ab86002d6cb8916b4ea95c040d..663b8ea323d9d83c341e3b0357dd8594bc404e13 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_mem_string--storage936682951--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "foo" 0 } None)' and input '"foo"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_mem_string.tz on storage '(Pair { Elt "foo" 0 } None)' and input '"foo"' --level 1 --trace-stack
 storage
   (Pair { Elt "foo" 0 } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input15265129-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input15265129-.out
index f40bc7badee5d2d748caa66dde10aa296a111043..3865586bf840920e896a6845dcd5dcc8462c6c62 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input15265129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input15265129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 }' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input158311065-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input158311065-.out
index 3642d8a0c07d5e1bdef91a982a73d4384cbc669d..a0346f2c2aa7fa9c2063568282d384ff12132b09 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input158311065-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input158311065-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 }' --level 1 --trace-stack
 storage
   3
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input456982702-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input456982702-.out
index ceeea8e1e5633f39400d017b34cf7fd35ca998d0..2ef78d53eafef4059f10f9492737a573df592192 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input456982702-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input456982702-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 }' --level 1 --trace-stack
 storage
   6
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input457300675-.out
index fa5c8fbd81439afa3870e998026a787efbef263c..7356bc32c6c9ce0836705e8ad485d4d3a0446956 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -map_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/map_size.tz on storage 111 and input '{}' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mul--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mul--storage125992234--input125992234-.out
index fcf05588b358bce8d83d2f809b919c99bc6838ae..90e4a18d6bd4937af33a232fbf80958d5e4daf13 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mul--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mul--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mul.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mul.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out
index eb7fd6fe0905f31c2d42e8d8aba489950a4f6987..7fac8686a53a8fad18a11de69f3d46fec2490cf5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz on storage 0x00 and input 257 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz on storage 0x00 and input 257 --level 1 --trace-stack
 storage
   0x0101000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out
index a2dbc5055b5c05aafc8622c9978126ae099ab801..d5c9425ce25fd5d20daac0f3a04ef3b224f8e485 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz on storage 0x02 and input 16 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz on storage 0x02 and input 16 --level 1 --trace-stack
 storage
   0x1000000000000000000000000000000000000000000000000000000000000000
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input1067298059-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input1067298059-.out
index 06fb6e2f6a58f28eb617a9c7a2fe2567c425a7fb..8f9bc139b4e8ec419ccfeb122724799c70812ac3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input1067298059-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input1067298059-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left -2)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left -2)' --level 1 --trace-stack
 storage
   2
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input380029349-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input380029349-.out
index ddfe5aadbeaf6a193c3dc4cf243cf21693149632..6a4cedaf8e9ccc9f0daa25eff64c265d8fc49de2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input380029349-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input380029349-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Right 2)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Right 2)' --level 1 --trace-stack
 storage
   -2
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input563503226-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input563503226-.out
index 6a04bbe6d8b5665ad46a7832e443f584c1e51bed..a6112f3185027e2081b7ebc7530fc126bfeeb25c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input563503226-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input563503226-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left 2)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left 2)' --level 1 --trace-stack
 storage
   -2
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input788662499-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input788662499-.out
index a3bea15f4a50d70eca91751e397beaf79312a30d..10f706449a024b7db21afa1dea84c00a4fd7f630 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input788662499-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input788662499-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Right 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Right 0)' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input972832189-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input972832189-.out
index 24733e794a8c2abe1b53d2599cedbb4238787b06..93b139e9659ce409d1158f2aeef964434dba0c22 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input972832189-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -neg--storage680650890--input972832189-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/neg.tz on storage 0 and input '(Left 0)' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -none--storage11179311--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -none--storage11179311--input125992234-.out
index ac588d9ebbc356456c9c419ae5d51223ebf2107b..0f3ab4aca23d6a26caeae9c7bdd173e435f68d14 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -none--storage11179311--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -none--storage11179311--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/none.tz on storage 'Some 10' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/none.tz on storage 'Some 10' and input Unit --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input570553153-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input570553153-.out
index f889a517e05e104bf10ca4fa437a02e6156c048c..b93080f684a424650ee30ba630fb67f823fd6682 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input570553153-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input570553153-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not.tz on storage None and input False --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not.tz on storage None and input False --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input954397288-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input954397288-.out
index 4d9852099630509cff788a3dc06b57a130a036d0..11ef1cb15b98b6cc41201e6538c4b5670dd817cb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input954397288-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not--storage921624073--input954397288-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not.tz on storage None and input True --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not.tz on storage None and input True --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input1051197453-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input1051197453-.out
index 1a3f4aef024b0cbcd1f41e3c7145672e492d8efe..fa73cf593ca7007a4c5998ece640b9949ed50345 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input1051197453-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input1051197453-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 8)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 8)' --level 1 --trace-stack
 storage
   (Some -9)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input123939249-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input123939249-.out
index 311a75662f4c69cb7337a9704e499503d247c228..a949d60aa75100cfc24f61a7b7988909b4d5f3b9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input123939249-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input123939249-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 7)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 7)' --level 1 --trace-stack
 storage
   (Some -8)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input24243730-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input24243730-.out
index 6936f428bf4d54ba3996bc45b71210066988c459..3667fe01977965df0dc438a0a02171e89d245df9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input24243730-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input24243730-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left -8)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left -8)' --level 1 --trace-stack
 storage
   (Some 7)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input518945720-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input518945720-.out
index 91555724c571511b9416245ac9f3d3f8c00973bd..284a7836fe53403199e7de23ff4a8baa99c657b6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input518945720-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input518945720-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 8)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 8)' --level 1 --trace-stack
 storage
   (Some -9)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input788662499-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input788662499-.out
index 12d070a235230363d8df4d50abefefc0a94aa483..c1c1c0be85f80d44d159e1b0252d5d8b29a7a9c0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input788662499-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input788662499-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 0)' --level 1 --trace-stack
 storage
   (Some -1)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input906118781-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input906118781-.out
index 4db9abe1a0c7be280e5521a0a897ad4aea1a71d8..eb1a999c7699da04004bc290e09e13cb19218c11 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input906118781-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input906118781-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 7)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Right 7)' --level 1 --trace-stack
 storage
   (Some -8)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input921874253-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input921874253-.out
index 46b1b0a524d30af9b6ac66d56640b3732236621b..abf5e8d396e2df9494fd19e0a48c650514c93345 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input921874253-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input921874253-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left -9)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left -9)' --level 1 --trace-stack
 storage
   (Some 8)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input972832189-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input972832189-.out
index c0057424e038b27eea23864416dd7b56b720bf26..e78995baa3171801f59a28d3affb573bca35d961 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input972832189-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_binary--storage921624073--input972832189-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_binary.tz on storage None and input '(Left 0)' --level 1 --trace-stack
 storage
   (Some -1)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_bytes--storage125992234--input125992234-.out
index c40a3babc88a64eb6b0c44499f9d606903b7f223..f0ea86ad84dece13c6f79a7d829a8925b608a137 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -not_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/not_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input106930123-.out
index 047f25ab5b14b96857b988da1d60e61ed5b97e21..ca79c24fd694168f138e294ea4236dd3db0518c8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input181204719-.out
index e9d462800c42077627bf4b58b60b3e7126bb8fe0..673eba6d9dbe7f09bc44e6f3e1a82fcd64c2a9a8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input223774825-.out
index 9b04a90c513612ab2929f17be8dffe9260b468b6..f40866bd7b947c7481553510035c5f74264fae16 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
 storage
   (Some False)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input908807505-.out
index 99727610cbad6a2525aeb9874e0cdad14a1dd594..8b874a22b9f2a9170ef6d26de04639b7291d7233 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
 storage
   (Some True)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input1056991424-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input1056991424-.out
index 3be9804dfefe7bdc5c19993b2afe2326c2100c55..88d95272698087c265122729d01619552ba588ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input1056991424-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input1056991424-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 0 8)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 0 8)' --level 1 --trace-stack
 storage
   (Some 8)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input375993021-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input375993021-.out
index 439ef5b928c59d1436c11cc4c79c203d0d4c9f9b..f8e9d33a4d67c53f8f3f604c6bca73e18b509372 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input375993021-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input375993021-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 14 1)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 14 1)' --level 1 --trace-stack
 storage
   (Some 15)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input673240563-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input673240563-.out
index 3183e0dbca37186e044e8592610bd2a81fd25bc4..74f16da6338c6ea5dbcb7cc75d95f2e47925b3fc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input673240563-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input673240563-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 8 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 8 0)' --level 1 --trace-stack
 storage
   (Some 8)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input747448890-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input747448890-.out
index ae85e4575365eb85ec91810fef41a3da8e5786eb..da408407d76753ba0584a201d2b39e2d290c67e8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input747448890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input747448890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 7 7)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 7 7)' --level 1 --trace-stack
 storage
   (Some 7)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input832403787-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input832403787-.out
index f7ab254f703255de9dfd91492555ba197f639b30..3d1e569a6a5e2aee31144b9f2a6b2a13de3957c2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input832403787-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input832403787-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 15 4)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 15 4)' --level 1 --trace-stack
 storage
   (Some 15)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input858098961-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input858098961-.out
index 28551df53b3556c71f2e51c973059fae30017131..340b5b0a057db7158095fe49864ac90208552a22 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input858098961-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_binary--storage921624073--input858098961-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 4 8)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_binary.tz on storage None and input '(Pair 4 8)' --level 1 --trace-stack
 storage
   (Some 12)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_bytes--storage125992234--input125992234-.out
index e0c6a908eadc837b57ad490fa884ea9f867c35e3..94bd436ec38285a414e339059cf8eeeb4851f5e7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -or_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/or_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input305844558-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input305844558-.out
index ad4c28d403c0cd8b2501be71cfb1086f445a168c..08214eed129305efc16f72e67e7ad8c739ad4592 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input305844558-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input305844558-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev.tz on storage Unit and input '(Pair -1 (Pair 1 (Pair "foobar" (Pair 0x00AABBCC (Pair 1000 (Pair False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev.tz on storage Unit and input '(Pair -1 (Pair 1 (Pair "foobar" (Pair 0x00AABBCC (Pair 1000 (Pair False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input646365167-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input646365167-.out
index 81aad16256188bf8807de2611c0f2559184b3f10..6250a434076d5cba9000d2a22b540407c423c068 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input646365167-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev--storage125992234--input646365167-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev.tz on storage Unit and input '(Pair -1  (Pair 1 (Pair "foobar" (Pair 0x00AABBCC (Pair 1000 (Pair False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev.tz on storage Unit and input '(Pair -1  (Pair 1 (Pair "foobar" (Pair 0x00AABBCC (Pair 1000 (Pair False (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out
index 1a5e656e880c3c3580a6a3d21775b7086b9012b1..453a11f378599247fd175d4b954b432916c2d857 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev_cty.tz on storage Unit and input '(Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit }  (Pair { True }  (Pair (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" }  { PACK } )))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev_cty.tz on storage Unit and input '(Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7") (Pair { Unit }  (Pair { True }  (Pair (Pair 19 10) (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") (Pair { Elt 0 "foo" ; Elt 1 "bar" }  { PACK } )))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out
index 8713999f5965cda3f2ee793d704149bc16af0d23..055d7c8b36d6aa712b44b403ca7ec92a2189168c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev_cty.tz on storage Unit and input '(Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None (Pair {  }  (Pair {  }  (Pair (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") (Pair {  }  { DUP ; DROP ; PACK } )))))))))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/packunpack_rev_cty.tz on storage Unit and input '(Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" (Pair Unit (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" (Pair None (Pair {  }  (Pair {  }  (Pair (Pair 40 -10) (Pair (Right "2019-09-09T08:35:33Z") (Pair {  }  { DUP ; DROP ; PACK } )))))))))' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input106930123-.out
index 0095cf84138755b21873b60eb438e3c2ad311238..3011f92b815cb624941c429c25e7dc5c6f72904c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair False True)' --level 1 --trace-stack
 storage
   (Some (Pair False True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input181204719-.out
index 00a95a4ec91032a6dd8a602534d504e55eb4eecc..bee7c4c8325c014014b4297ca90e8a70f0dbc420 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair True False)' --level 1 --trace-stack
 storage
   (Some (Pair True False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input223774825-.out
index 4f944d9cf1786316491f55a8a32d48be6b53575e..5ef85f370b130fe0fb45dc43a7f603efe6654ed5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair False False)' --level 1 --trace-stack
 storage
   (Some (Pair False False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input908807505-.out
index 28c0031b798a79d772964e2ce148160dfcf9aeae..a31b56c694baf9641694ee28bab141137a30e2d7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pair_id--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pair_id.tz on storage None and input '(Pair True True)' --level 1 --trace-stack
 storage
   (Some (Pair True True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec--storage256947135--input1050356042-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec--storage256947135--input1050356042-.out
index 002b97af65a98cec02b100130d842375a072c5b4..42ee70ef3e2acc5df7232f503a46bfa7a46030e7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec--storage256947135--input1050356042-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec--storage256947135--input1050356042-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pexec.tz on storage 14 and input 38 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pexec.tz on storage 14 and input 38 --level 1 --trace-stack
 storage
   52
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec_2--storage197120858--input179371027-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec_2--storage197120858--input179371027-.out
index d35d6fadf229e95e0c84656b4abb5cf0eb0036f9..184e00293ed1d76f4b6946826b6ac696a573ac00 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec_2--storage197120858--input179371027-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -pexec_2--storage197120858--input179371027-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pexec_2.tz on storage '{ 0 ; 1 ; 2 ; 3}' and input 4 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/pexec_2.tz on storage '{ 0 ; 1 ; 2 ; 3}' and input 4 --level 1 --trace-stack
 storage
   { 0 ; 7 ; 14 ; 21 }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ret_int--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ret_int--storage921624073--input125992234-.out
index ad9623027c2399ae85f92296aa339cff6a1c96ba..5dc6a8b7990d85f7ad60b37947c8b2d266958657 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ret_int--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -ret_int--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ret_int.tz on storage None and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/ret_int.tz on storage None and input Unit --level 1 --trace-stack
 storage
   (Some 300)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input457300675-.out
index 9474565fac1dab809ae52896574af4bb6bf70b33..3c8f7903d7f44093ee03f05ff4d994620914bf70 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse.tz on storage '{""}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse.tz on storage '{""}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input851203613-.out
index 8ae9cbae0f7c45a7fc7965d23a40520b83151375..5f69b90977d837b14adb4f2efc6e0cb644c2275c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input457300675-.out
index 68b95bfbb547c798a129f1eeaad5c7665cd4080a..e445cb86522a8c5acd08475cb4675fa507ac1f89 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse_loop.tz on storage '{""}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse_loop.tz on storage '{""}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input851203613-.out
index e1eaaad9f7a7f93748ff66db56e5caaad092d075..faa5b23db68ce61efff74a0bdba9135ca942c177 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -reverse_loop--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse_loop.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/reverse_loop.tz on storage '{""}' and input '{ "c" ; "b" ; "a" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sapling_empty_state--storage457300675--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sapling_empty_state--storage457300675--input125992234-.out
index cdac96f112069ac407f265b502ee3be90baa19da..e5d709b8e29041858b5ec3a049a63fd170629c74 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sapling_empty_state--storage457300675--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sapling_empty_state--storage457300675--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sapling_empty_state.tz on storage '{}' and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sapling_empty_state.tz on storage '{}' and input Unit --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_address--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_address--storage125992234--input125992234-.out
index 84d1dd07a735765e2912b06c27ab4817d8643477..558b933cd97403cb252af9619ad4c562f1d6b228 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_address--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_address--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_address.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_address.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out
index 6cf329e04f5d09893cb167555ce75a1bcf6d7285..32db3a223ec29ddc8afc77cfabc81785411e7fdf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_with_default_entrypoint.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_with_default_entrypoint.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_entrypoint--storage125992234--input289072903-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_entrypoint--storage125992234--input289072903-.out
index 4e7fd4c45373c88b9fcbad768b1cb6d75b60d0de..047de99b620c635f6c75189d5ed5762a60bbf67c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_entrypoint--storage125992234--input289072903-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -self_with_entrypoint--storage125992234--input289072903-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_with_entrypoint.tz on storage Unit and input 'Left (Left 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/self_with_entrypoint.tz on storage Unit and input 'Left (Left 0)' --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input620760059-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input620760059-.out
index 5b20687691ee47d789586b068668db3b087204c7..490d3a4a669e90aa15e66ed7cc8b9c88a42f9166 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input620760059-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input620760059-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '"world"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '"world"' --level 1 --trace-stack
 storage
   (Pair "world" 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input717096222-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input717096222-.out
index 89e995024675194438aa4d1c960ea15b83cd7e9c..614f4baa771bff6b9c46b80be2f0ea1d57aa2a55 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input717096222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input717096222-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '"abc"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '"abc"' --level 1 --trace-stack
 storage
   (Pair "abc" 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input79230375-.out
index 983702e76ca160447dc5a0fe3ef6ffc3efa27637..fcd5362e7f8d358450fce764b4a97795607e084d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_car--storage224747103--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '""' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_car.tz on storage '(Pair "hello" 0)' and input '""' --level 1 --trace-stack
 storage
   (Pair "" 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage205576101--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage205576101--input654274102-.out
index 92cb7722e127693dc05da36cee112a43ba054dd7..552bd1d9c43d0f0daad9ee281d20c3d283788bda 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage205576101--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage205576101--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 500)' and input 3 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 500)' and input 3 --level 1 --trace-stack
 storage
   (Pair "hello" 3)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage224747103--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage224747103--input453441034-.out
index 16ba890e6f2ee067e8ffe086cce5557262306069..6a5471514a33e40522aaf9ab708113fc202eb45c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage224747103--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage224747103--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 0)' and input 1 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 0)' and input 1 --level 1 --trace-stack
 storage
   (Pair "hello" 1)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage611418174--input967284912-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage611418174--input967284912-.out
index 4690249ddb6a0d72c389fcf4a584d2ced068d248..7cc931e43b0155b53cddcdb0d2413fcca787a4d3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage611418174--input967284912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_cdr--storage611418174--input967284912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 7)' and input 100 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_cdr.tz on storage '(Pair "hello" 7)' and input 100 --level 1 --trace-stack
 storage
   (Pair "hello" 100)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input264787654-.out
index 662809e27016b2754e965dbddf3e48003132cd6b..304754cc039929cd0def51088de3752bc58ed94c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{ "a" ; "b" ; "c" }' --level 1 --trace-stack
 storage
   { "a" ; "b" ; "c" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input457300675-.out
index 08cb588ec73d5ad8c8e402e7773755e9be04b4a2..5ec074b0cdfc0552574e614b81ee1bf65b108ced 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{}' --level 1 --trace-stack
 storage
   {}
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input989507347-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input989507347-.out
index 184ea7981d045f349779e3fa39cac6bc08344dfe..5519db725e0d186404f382fa065362e64f030999 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input989507347-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_id--storage457300675--input989507347-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{ "asdf" ; "bcde" }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_id.tz on storage '{}' and input '{ "asdf" ; "bcde" }' --level 1 --trace-stack
 storage
   { "asdf" ; "bcde" }
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input457300675-.out
index 71e01ef1a33177981de91a9630924dfec33326fe..bfa05143ca02f51499470c33c7bc5934eeddec3f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{}' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input701684511-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input701684511-.out
index f2cadf30e5f2a49466ad22e17b0aa0baae9f3746..b12be9cce9aec3eaf0403dcc4dd23c8efd5f5941 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input701684511-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input701684511-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{ -100 ; 1 ; 2 ; 3 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{ -100 ; 1 ; 2 ; 3 }' --level 1 --trace-stack
 storage
   -94
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input802622031-.out
index 65ffefb48b9fa8e0f1ad475b60d8f51881b8efaf..51bec84cb5b560ee939b8169ad6dc3308cea04c8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_iter--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_iter.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage495706788--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage495706788--input33757838-.out
index 154848d219e19fa8f84f94e18378d58df80f0164..48765693ea50fd2dc14169b51e289ba1a165ab8e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage495706788--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage495706788--input33757838-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair {} None)' and input '"Hi"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair {} None)' and input '"Hi"' --level 1 --trace-stack
 storage
   (Pair {} (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage550087893--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage550087893--input79230375-.out
index 70828c4feb1d3f66951094b882122f7311c408f1..19a9dfadff2abad3219a5717cc355f04e9470cf1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage550087893--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage550087893--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair { "Hello" ; "World" } None)' and input '""' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair { "Hello" ; "World" } None)' and input '""' --level 1 --trace-stack
 storage
   (Pair { "Hello" ; "World" } (Some False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage605111220--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage605111220--input33757838-.out
index c6549f6ababf52e6d888e6d72e442ba5988e18f7..a87f9f034af0aa74c75b98745dcdfd49eda069df 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage605111220--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_member--storage605111220--input33757838-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair { "Hi" } None)' and input '"Hi"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_member.tz on storage '(Pair { "Hi" } None)' and input '"Hi"' --level 1 --trace-stack
 storage
   (Pair { "Hi" } (Some True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input403499055-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input403499055-.out
index 5ecb84701b4664bdc2f525403bbe903ce91600e0..fc5f110c7fba847269b00efb8e2d6c06906493ec 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input403499055-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input403499055-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' --level 1 --trace-stack
 storage
   6
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input457300675-.out
index 72a756b07b28a8d06e07a693f6fa651143ed42fc..dfb967f710620b2479b862bd0f397e73d46d3b0a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{}' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{}' --level 1 --trace-stack
 storage
   0
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input469078912-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input469078912-.out
index 698b4e2d4c2bd51629dbc98db2dc222ed0478226..3128174e533c4e914bf068345498bd0f5b2535aa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input469078912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input469078912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 ; 2 ; 3 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 ; 2 ; 3 }' --level 1 --trace-stack
 storage
   3
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input802622031-.out
index 8ea49dfb6c459a8a70a220fe22c84ff8e8db3b6a..75ca51ac382399763622d5c779034e4246f7917e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -set_size--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/set_size.tz on storage 111 and input '{ 1 }' --level 1 --trace-stack
 storage
   1
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sha3--storage921624073--input1008262038-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sha3--storage921624073--input1008262038-.out
index 45c5b7234a283f9496e18ce2d6edbf5cf6d32629..e6e0103d4ac2a17abee1048d4b3caf27149f3a06 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sha3--storage921624073--input1008262038-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sha3--storage921624073--input1008262038-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sha3.tz on storage None and input 0x48656c6c6f2c20776f726c6421 --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sha3.tz on storage None and input 0x48656c6c6f2c20776f726c6421 --level 1 --trace-stack
 storage
   (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input115382786-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input115382786-.out
index 94c1f387f026bffb4c3d59e7bdea2b78e58c3782..5b7da22c5aa3132e338e2817854b435a3969c5ab 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input115382786-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input115382786-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 15 2))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 15 2))' --level 1 --trace-stack
 storage
   (Some 60)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input271566295-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input271566295-.out
index 5318ae726445f0190d279b45b98811f51431c6af..f3c0cbc6b96daca4a686ddc6bfcd7d096d4087db 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input271566295-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input271566295-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 0 1))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 0 1))' --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input340971987-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input340971987-.out
index 5f46f849c0da3f011a54aa84a7431d210393dc1e..9ef4461bf31d290a910f10c786627331749802ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input340971987-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input340971987-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 0 0))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 0 0))' --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input374168553-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input374168553-.out
index 22e45f3f8f542cc5b96de628734192b71955dd16..626b6090e59994b05937644698ab3f702831781e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input374168553-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input374168553-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 15 2))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 15 2))' --level 1 --trace-stack
 storage
   (Some 3)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input413621582-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input413621582-.out
index e2fb3207c9dd380102e23f5038b9271b339a22dc..9ca61d80b0183c7317bfbefa22ba5d61e94e9655 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input413621582-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input413621582-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 1 2))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 1 2))' --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input424849461-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input424849461-.out
index a916e3c66d58373f6432c561e1cf74aa9252e185..546b7eebdafb168a51a368c8bf32ce1eaf2f2c3a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input424849461-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input424849461-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 1 2))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 1 2))' --level 1 --trace-stack
 storage
   (Some 4)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input485030042-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input485030042-.out
index d80feff2e8530790f7c1690fa6b382ce4d8ba92b..4c62317515f4e4b18388b25a41ef05241eb331a0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input485030042-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input485030042-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 8 1))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 8 1))' --level 1 --trace-stack
 storage
   (Some 16)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input705767726-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input705767726-.out
index 08878008d7cccdbb4b137d1e97713ec08be865c6..28cf127df0f78c062bd18977ae34e9ce996f8b81 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input705767726-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input705767726-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 8 1))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 8 1))' --level 1 --trace-stack
 storage
   (Some 4)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input769385932-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input769385932-.out
index 07bcec30c52566885955b1168281013a2e432f3b..d3195ee7c992d8f9d070e157848e752af42bb992 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input769385932-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input769385932-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 0 1))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Left (Pair 0 1))' --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input913715337-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input913715337-.out
index c2c4023f7e75d56b19dfed75c09f89a82dc7e6c2..1dd767f7f78cf9779d86499484e1b3378c704edc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input913715337-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -shifts--storage921624073--input913715337-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 0 0))' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/shifts.tz on storage None and input '(Right (Pair 0 0))' --level 1 --trace-stack
 storage
   (Some 0)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage351480851--input65907686-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage351480851--input65907686-.out
index 6a8b0b676288b1efd1aaa191d11cd7d1213f33da..5aeb9678bdf463d72b89aea4ed41a1b732086b48 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage351480851--input65907686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage351480851--input65907686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some"FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo"' and input 'Pair 1 10000' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some"FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo"' and input 'Pair 1 10000' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input198821575-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input198821575-.out
index 20b78f4f31630b31d542756c8266eeb733840c24..0e2d5e65db81e06eb3e7436237712c026688e3aa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input198821575-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input198821575-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 1 1' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 1 1' --level 1 --trace-stack
 storage
   (Some "o")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input359592843-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input359592843-.out
index 0c2aabec80778c3b18e9cb9d6dc7ddf7acf8f44f..52b8571c4ab9f518f844086af96faa08c93ce58f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input359592843-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input359592843-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 10 5' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 10 5' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input551316239-.out
index fed90a8f4140a365e1f1bc8a1dfbf511548903d0..d2c64e23cc6f66aa58aedbfda7e8f9e304de1f63 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 0' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 0' --level 1 --trace-stack
 storage
   (Some "")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input722749044-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input722749044-.out
index 4598fae6b3fcad0898a9c8dac3ddb60d1408b2e7..aa8e11c32c6e6522f91bc638c1808a5528c3a866 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input722749044-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input722749044-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 10' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 10' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input839234860-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input839234860-.out
index 5a04ef98caaa55364d225df12dc5bfb48220a807..6a16d86da7e710a4c74f54822f494fe750629186 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input839234860-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input839234860-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 1 3' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 1 3' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input919180079-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input919180079-.out
index c90af31eb781f0dc32a94ca43be96b7c9717dd02..c8781bcbc9c1ba5611a4b7b07d51e7ba4d7cbb42 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input919180079-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage364922380--input919180079-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 2' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage 'Some "Foo"' and input 'Pair 0 2' --level 1 --trace-stack
 storage
   (Some "Fo")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage921624073--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage921624073--input551316239-.out
index 15c724bf075a65b92c42e0f6b568d846fa97375d..b43286a85e9d5c115fa6d10ea09e03054fd6ab60 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage921624073--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice--storage921624073--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage None and input 'Pair 0 0' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice.tz on storage None and input 'Pair 0 0' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input198821575-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input198821575-.out
index c205d249b3700cc7f040397c40e6aea07c68dcbf..dfc25ee78f7363dd90a866e89c33d786934e31ff 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input198821575-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input198821575-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 1' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 1' --level 1 --trace-stack
 storage
   (Some 0xbb)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input462551352-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input462551352-.out
index 649f4ba15a6aa842619d367fa86a1235ff85efa0..fb06af36332b3b969d195c364422ae741dfc4320 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input462551352-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input462551352-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 0 1' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 0 1' --level 1 --trace-stack
 storage
   (Some 0xaa)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input489157380-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input489157380-.out
index 58d7489205fe43cbffd591583898a3d394087485..dc42d650f557664e83bd6209fb9317ef0fbd8e91 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input489157380-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input489157380-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 2' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 2' --level 1 --trace-stack
 storage
   (Some 0xbbcc)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input551316239-.out
index ba11a66394e6052322248539017012da926bebf5..3d90ec5b5a8d71acf7859ae185772d0a6362492d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 0 0' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 0 0' --level 1 --trace-stack
 storage
   (Some 0x)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input669330759-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input669330759-.out
index 4be6fb4c59d76937478df5da7365c5d4d9bf3593..20441eece52dcb2bfee716b96ce7e1c85a792010 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input669330759-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input669330759-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 2 2' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 2 2' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input743596105-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input743596105-.out
index 160b55c5cf5b9ce8dd7ae808ff570335ed7ee5b4..0ea86d81b94ef1657cd7996de871fadf6cb3cc2c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input743596105-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input743596105-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 2 1' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 2 1' --level 1 --trace-stack
 storage
   (Some 0xcc)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input839234860-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input839234860-.out
index b08e240af30cb0869858abc7465d00fb1124e0b4..af20606a62206799ecb01f66b38e8411f54fc508 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input839234860-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage229749865--input839234860-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 3' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbcc' and input 'Pair 1 3' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage504917929--input65907686-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage504917929--input65907686-.out
index 08f746131824c324d8d2e8cf33b0297f189a5f27..e8085d984e74a4669868a303257befe80a0842d8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage504917929--input65907686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage504917929--input65907686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc' and input 'Pair 1 10000' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage 'Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc' and input 'Pair 1 10000' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage921624073--input462551352-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage921624073--input462551352-.out
index 08efac20b9be3f84045db0adaf10b8f88bf3e985..1a1dd48278e7e98222abe5bb3998eb8e5df583d0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage921624073--input462551352-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -slice_bytes--storage921624073--input462551352-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage None and input 'Pair 0 1' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/slice_bytes.tz on storage None and input 'Pair 0 1' --level 1 --trace-stack
 storage
   None
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input1016369050-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input1016369050-.out
index 042658dd7f67a1a6a71cb93aa67f1dddb27be157..da5929cbd6ca121dcbe4a115a59d38637b83b51e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input1016369050-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input1016369050-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/str_id.tz on storage None and input '"abcd"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/str_id.tz on storage None and input '"abcd"' --level 1 --trace-stack
 storage
   (Some "abcd")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input93477117-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input93477117-.out
index ab51edb06a8d5ed987cc2bd1716f3d4ef634a4f5..a7efaa2216826804407585d08922d26f12239447 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input93477117-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -str_id--storage921624073--input93477117-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/str_id.tz on storage None and input '"Hello"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/str_id.tz on storage None and input '"Hello"' --level 1 --trace-stack
 storage
   (Some "Hello")
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out
index 26d721794cdc9418cdff5829ae88ef827ccd1815..c7bae47d553638a58850da335e844f16bf2ce317 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 100)' --level 1 --trace-stack
 storage
   "1970-01-01T00:00:00Z"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out
index 4df70433eb2383f7c9107bc289d26d794a18737e..0b7ab3d387f7769ff75af95661a0a120ecd5f958 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 -100)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 -100)' --level 1 --trace-stack
 storage
   "1970-01-01T00:03:20Z"
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out
index a0afce711e9e992ad0db4074c83e2b3d5f9ea340..e45e69722868b07f48f38b389d6a9ccff87388a6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 2000000000000000000)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/sub_timestamp_delta.tz on storage 111 and input '(Pair 100 2000000000000000000)' --level 1 --trace-stack
 storage
   -1999999999999999900
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input706350605-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input706350605-.out
index 29b686e47243e37272bf898ee7020b3ac2690161..a07aa28f040bfcba97bc963ce254c12de931eea4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input706350605-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input706350605-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/tez_add_sub.tz on storage None and input '(Pair 2310000 1010000)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/tez_add_sub.tz on storage None and input '(Pair 2310000 1010000)' --level 1 --trace-stack
 storage
   (Some (Pair 3320000 1300000))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input856198194-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input856198194-.out
index c0a551dbe8a0a5d08812d1418da33a5443d67b0b..68e7823ff748633317e94a06a3289d3bf367a6c7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input856198194-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -tez_add_sub--storage921624073--input856198194-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/tez_add_sub.tz on storage None and input '(Pair 2000000 1000000)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/tez_add_sub.tz on storage None and input '(Pair 2000000 1000000)' --level 1 --trace-stack
 storage
   (Some (Pair 3000000 1000000))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -uncomb--storage680650890--input394061083-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -uncomb--storage680650890--input394061083-.out
index bac65f1b407520bcf665d346418484197da73ccd..2ef225c1b6b6438619c806bc2e5d2c4b3c5115ca 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -uncomb--storage680650890--input394061083-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -uncomb--storage680650890--input394061083-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/uncomb.tz on storage 0 and input '(Pair 1 4 2)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/uncomb.tz on storage 0 and input '(Pair 1 4 2)' --level 1 --trace-stack
 storage
   142
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -unpair--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -unpair--storage125992234--input125992234-.out
index 7a2e41a8313d008a542103563b6750b39fd9e60b..60cadfe44480fa4d508f91ffaec8b8d9659d2224 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -unpair--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -unpair--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/unpair.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/unpair.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -voting_power--storage1011138251--input1040351577-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -voting_power--storage1011138251--input1040351577-.out
index 5901d228e57010781beb4bb8abc172536a3c2747..940daf139967c19ca661941988eab0c9c98168d4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -voting_power--storage1011138251--input1040351577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -voting_power--storage1011138251--input1040351577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/voting_power.tz on storage '(Pair 0 0)' and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/voting_power.tz on storage '(Pair 0 0)' and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' --level 1 --trace-stack
 storage
   (Pair 4000000000000 20000000000000)
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1058477720-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1058477720-.out
index f5296a23a6a016bb78c3ab4bbd4fae8bcfd18db8..c5f6daca8a93b11c7890a54800c2133a192071e5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1058477720-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1058477720-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair False False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair False False)' --level 1 --trace-stack
 storage
   (Some (Left False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1073176155-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1073176155-.out
index 027fc79b7a9cff1cd44b7bc033adaa43d9181c8d..2b551b0eaceb9a31415ac72ce7c9181ca5ae94c2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1073176155-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input1073176155-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 0 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 0 0)' --level 1 --trace-stack
 storage
   (Some (Right 0))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input246594902-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input246594902-.out
index 66cccf6bbf30ab3004abcfe5f30a0227f2392273..dd81b8297fcfff47bda04c5713d0aa25cdcdd23c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input246594902-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input246594902-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair True False)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair True False)' --level 1 --trace-stack
 storage
   (Some (Left True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input506603577-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input506603577-.out
index 186680cc6b603ee2c68c18a70fb8ad00bfbc5e23..6008c8225328e735cd64f33e4a32fbc4a2eaf17a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input506603577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input506603577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 1 1)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 1 1)' --level 1 --trace-stack
 storage
   (Some (Right 0))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input576248088-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input576248088-.out
index b064858ca9018b5d6c21abd08c8f8a92c36620ab..b09a91b98369045461fc04d0f6b26d57e077c38e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input576248088-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input576248088-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 0 1)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 0 1)' --level 1 --trace-stack
 storage
   (Some (Right 1))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input612012282-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input612012282-.out
index e81af374a01d346823cdce5830b250e33eba0146..0065f524f1e65ea26d7cbdff603c646564e6bbf4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input612012282-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input612012282-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 42 21)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 42 21)' --level 1 --trace-stack
 storage
   (Some (Right 63))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input617591686-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input617591686-.out
index 90371ee620219acf8806ac6b9133fff0acdf4446..4d09c16600e954e1390f91fb963e6d385520c90b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input617591686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input617591686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair False True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair False True)' --level 1 --trace-stack
 storage
   (Some (Left True))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input639311176-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input639311176-.out
index edb628e74e319eebecb2359b45c27561060b8913..c26c579ea2c96a79355d795d44107abcb7f5ce77 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input639311176-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input639311176-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair True True)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Left (Pair True True)' --level 1 --trace-stack
 storage
   (Some (Left False))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input688315180-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input688315180-.out
index 6cf7083ff153ef86b37613c11d201a0b72537286..4a31c1744552a63624d127990e101492fddd45e3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input688315180-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input688315180-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 42 63)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 42 63)' --level 1 --trace-stack
 storage
   (Some (Right 21))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input967929605-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input967929605-.out
index 0e92c2ab12fd1cfd88ee0fd5a945ca030e25656d..57a6371775c7fd8127137cb192ad4967af8769ec 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input967929605-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor--storage921624073--input967929605-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 1 0)' --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor.tz on storage None and input 'Right (Pair 1 0)' --level 1 --trace-stack
 storage
   (Some (Right 1))
 emitted operations
diff --git a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor_bytes--storage125992234--input125992234-.out
index f835518a39fa948c726e9a71a6b800adf91a0987..250d5f73675aca80bce797d9a251193076bf536e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Paris- opcodes -xor_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run script michelson_test_scripts/opcodes/xor_bytes_016.tz on storage Unit and input Unit --level 1 --trace-stack
 storage
   Unit
 emitted operations
diff --git a/tezt/tests/expected/contract_typecheck_regression.ml/Paris- Tc scripts.out b/tezt/tests/expected/contract_typecheck_regression.ml/Paris- Tc scripts.out
index b6ab939d40f9feff3b946d9b87c38c4c210052b2..bc1b78e15a73ea954e5d79ea4615e99d45558e24 100644
--- a/tezt/tests/expected/contract_typecheck_regression.ml/Paris- Tc scripts.out	
+++ b/tezt/tests/expected/contract_typecheck_regression.ml/Paris- Tc scripts.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings typecheck script michelson_test_scripts/attic/accounts.tz michelson_test_scripts/attic/add1.tz michelson_test_scripts/attic/add1_list.tz michelson_test_scripts/attic/after_strategy.tz michelson_test_scripts/attic/always.tz michelson_test_scripts/attic/append.tz michelson_test_scripts/attic/at_least.tz michelson_test_scripts/attic/auction.tz michelson_test_scripts/attic/bad_lockup.tz michelson_test_scripts/attic/big_map_union.tz michelson_test_scripts/attic/cadr_annotation.tz michelson_test_scripts/attic/concat.tz michelson_test_scripts/attic/conditionals.tz michelson_test_scripts/attic/cons_twice.tz michelson_test_scripts/attic/cps_fact.tz michelson_test_scripts/attic/create_add1_lists.tz michelson_test_scripts/attic/data_publisher.tz michelson_test_scripts/attic/dispatch.tz michelson_test_scripts/attic/empty.tz michelson_test_scripts/attic/fail_amount.tz michelson_test_scripts/attic/faucet.tz michelson_test_scripts/attic/forward.tz michelson_test_scripts/attic/id.tz michelson_test_scripts/attic/infinite_loop.tz michelson_test_scripts/attic/insertion_sort.tz michelson_test_scripts/attic/int_publisher.tz michelson_test_scripts/attic/king_of_tez.tz michelson_test_scripts/attic/list_of_transactions.tz michelson_test_scripts/attic/queue.tz michelson_test_scripts/attic/reduce_map.tz michelson_test_scripts/attic/reentrancy.tz michelson_test_scripts/attic/reservoir.tz michelson_test_scripts/attic/scrutable_reservoir.tz michelson_test_scripts/attic/spawn_identities.tz michelson_test_scripts/entrypoints/big_map_entrypoints.tz michelson_test_scripts/entrypoints/delegatable_target.tz michelson_test_scripts/entrypoints/manager.tz michelson_test_scripts/entrypoints/no_default_target.tz michelson_test_scripts/entrypoints/no_entrypoint_target.tz michelson_test_scripts/entrypoints/rooted_target.tz michelson_test_scripts/entrypoints/simple_entrypoints.tz michelson_test_scripts/macros/assert.tz michelson_test_scripts/macros/assert_cmpeq.tz michelson_test_scripts/macros/assert_cmpge.tz michelson_test_scripts/macros/assert_cmpgt.tz michelson_test_scripts/macros/assert_cmple.tz michelson_test_scripts/macros/assert_cmplt.tz michelson_test_scripts/macros/assert_cmpneq.tz michelson_test_scripts/macros/assert_eq.tz michelson_test_scripts/macros/assert_ge.tz michelson_test_scripts/macros/assert_gt.tz michelson_test_scripts/macros/assert_le.tz michelson_test_scripts/macros/assert_lt.tz michelson_test_scripts/macros/assert_neq.tz michelson_test_scripts/macros/big_map_get_add.tz michelson_test_scripts/macros/big_map_mem.tz michelson_test_scripts/macros/build_list.tz michelson_test_scripts/macros/carn_and_cdrn.tz michelson_test_scripts/macros/compare.tz michelson_test_scripts/macros/compare_bytes.tz michelson_test_scripts/macros/fail.tz michelson_test_scripts/macros/guestbook.tz michelson_test_scripts/macros/macro_annotations.tz michelson_test_scripts/macros/map_caddaadr.tz michelson_test_scripts/macros/max_in_list.tz michelson_test_scripts/macros/min.tz michelson_test_scripts/macros/pair_macro.tz michelson_test_scripts/macros/set_caddaadr.tz michelson_test_scripts/macros/take_my_money.tz michelson_test_scripts/macros/unpair_macro.tz michelson_test_scripts/mini_scenarios/999_constant.tz michelson_test_scripts/mini_scenarios/add_clear_tickets_015.tz michelson_test_scripts/mini_scenarios/always_fails.tz michelson_test_scripts/mini_scenarios/authentication.tz michelson_test_scripts/mini_scenarios/big_map_all.tz michelson_test_scripts/mini_scenarios/big_map_entrypoints.tz michelson_test_scripts/mini_scenarios/big_map_magic.tz michelson_test_scripts/mini_scenarios/big_map_read.tz michelson_test_scripts/mini_scenarios/big_map_store.tz michelson_test_scripts/mini_scenarios/big_map_write.tz michelson_test_scripts/mini_scenarios/cache_consistency.tz michelson_test_scripts/mini_scenarios/check_signature.tz michelson_test_scripts/mini_scenarios/constant_entrypoints.tz michelson_test_scripts/mini_scenarios/constant_unit.tz michelson_test_scripts/mini_scenarios/create_contract.tz michelson_test_scripts/mini_scenarios/create_contract_simple.tz michelson_test_scripts/mini_scenarios/default_account.tz michelson_test_scripts/mini_scenarios/emit_events.tz michelson_test_scripts/mini_scenarios/execution_order_appender.tz michelson_test_scripts/mini_scenarios/execution_order_caller.tz michelson_test_scripts/mini_scenarios/execution_order_storer.tz michelson_test_scripts/mini_scenarios/fa12_reference.tz michelson_test_scripts/mini_scenarios/fail_on_false.tz michelson_test_scripts/mini_scenarios/generic_multisig.tz michelson_test_scripts/mini_scenarios/groth16.tz michelson_test_scripts/mini_scenarios/hardlimit.tz michelson_test_scripts/mini_scenarios/large_error.tz michelson_test_scripts/mini_scenarios/large_flat_contract.tz michelson_test_scripts/mini_scenarios/large_str_id.tz michelson_test_scripts/mini_scenarios/legacy_multisig.tz michelson_test_scripts/mini_scenarios/lockup.tz michelson_test_scripts/mini_scenarios/loop.tz michelson_test_scripts/mini_scenarios/lqt_fa12.mligo.tz michelson_test_scripts/mini_scenarios/multiple_en2.tz michelson_test_scripts/mini_scenarios/multiple_entrypoints_counter.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint_arg.tz michelson_test_scripts/mini_scenarios/nat_id.tz michelson_test_scripts/mini_scenarios/noop_bytes.tz michelson_test_scripts/mini_scenarios/originate_contract.tz michelson_test_scripts/mini_scenarios/parameterized_multisig.tz michelson_test_scripts/mini_scenarios/parsable_contract.tz michelson_test_scripts/mini_scenarios/receive_tickets_in_big_map.tz michelson_test_scripts/mini_scenarios/replay.tz michelson_test_scripts/mini_scenarios/reveal_signed_preimage.tz michelson_test_scripts/mini_scenarios/sc_rollup_forward.tz michelson_test_scripts/mini_scenarios/sc_rollup_mint_and_forward.tz michelson_test_scripts/mini_scenarios/self_address_receiver.tz michelson_test_scripts/mini_scenarios/self_address_sender.tz michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz michelson_test_scripts/mini_scenarios/send_ticket_list_multiple_016.tz michelson_test_scripts/mini_scenarios/send_tickets_from_storage_016.tz michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz michelson_test_scripts/mini_scenarios/smart_rollup_mint_and_deposit_ticket_016.tz michelson_test_scripts/mini_scenarios/smart_rollup_receive_tickets_016.tz michelson_test_scripts/mini_scenarios/str_id.tz michelson_test_scripts/mini_scenarios/ticket_builder_fungible.tz michelson_test_scripts/mini_scenarios/ticket_builder_non_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_non_fungible.tz michelson_test_scripts/mini_scenarios/tickets_015.tz michelson_test_scripts/mini_scenarios/tickets_bag_016.tz michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz michelson_test_scripts/mini_scenarios/tickets_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_create_and_send_015.tz michelson_test_scripts/mini_scenarios/tickets_list_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_mint_and_store_complex_param.tz michelson_test_scripts/mini_scenarios/tickets_receive_and_store.tz michelson_test_scripts/mini_scenarios/tickets_send_016.tz michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz michelson_test_scripts/mini_scenarios/tickets_store_fst_and_rely_snd.tz michelson_test_scripts/mini_scenarios/tzip4_view.tz michelson_test_scripts/mini_scenarios/very_small.tz michelson_test_scripts/mini_scenarios/view_check_caller.tz michelson_test_scripts/mini_scenarios/view_registers_callers.tz michelson_test_scripts/mini_scenarios/viewable.tz michelson_test_scripts/mini_scenarios/vote_for_delegate.tz michelson_test_scripts/mini_scenarios/weather_insurance.tz michelson_test_scripts/mini_scenarios/xcat.tz michelson_test_scripts/mini_scenarios/xcat_dapp.tz michelson_test_scripts/non_regression/262_bug.tz michelson_test_scripts/non_regression/843_bug.tz michelson_test_scripts/non_regression/bad_annot_contract.tz michelson_test_scripts/non_regression/pairk_annot.tz michelson_test_scripts/opcodes/abs.tz michelson_test_scripts/opcodes/add.tz michelson_test_scripts/opcodes/add_bls12_381_fr.tz michelson_test_scripts/opcodes/add_bls12_381_g1.tz michelson_test_scripts/opcodes/add_bls12_381_g2.tz michelson_test_scripts/opcodes/add_delta_timestamp.tz michelson_test_scripts/opcodes/add_timestamp_delta.tz michelson_test_scripts/opcodes/address.tz michelson_test_scripts/opcodes/amount_after_fib_view.tz michelson_test_scripts/opcodes/amount_after_nonexistent_view.tz michelson_test_scripts/opcodes/amount_after_view.tz michelson_test_scripts/opcodes/and.tz michelson_test_scripts/opcodes/and_binary.tz michelson_test_scripts/opcodes/and_bytes_016.tz michelson_test_scripts/opcodes/and_logical_1.tz michelson_test_scripts/opcodes/balance.tz michelson_test_scripts/opcodes/balance_after_fib_view.tz michelson_test_scripts/opcodes/balance_after_nonexistent_view.tz michelson_test_scripts/opcodes/balance_after_view.tz michelson_test_scripts/opcodes/big_map_mem_nat.tz michelson_test_scripts/opcodes/big_map_mem_string.tz michelson_test_scripts/opcodes/big_map_to_self.tz michelson_test_scripts/opcodes/bls12_381_fr_push_bytes_not_padded.tz michelson_test_scripts/opcodes/bls12_381_fr_push_nat.tz michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz michelson_test_scripts/opcodes/bls12_381_fr_to_mutez.tz michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz michelson_test_scripts/opcodes/bytes.tz michelson_test_scripts/opcodes/bytes_of_int_016.tz michelson_test_scripts/opcodes/bytes_of_nat_016.tz michelson_test_scripts/opcodes/car.tz michelson_test_scripts/opcodes/cdr.tz michelson_test_scripts/opcodes/chain_id.tz michelson_test_scripts/opcodes/chain_id_store.tz michelson_test_scripts/opcodes/check_signature.tz michelson_test_scripts/opcodes/comb.tz michelson_test_scripts/opcodes/comb-get.tz michelson_test_scripts/opcodes/comb-literals.tz michelson_test_scripts/opcodes/comb-set.tz michelson_test_scripts/opcodes/comb-set-2.tz michelson_test_scripts/opcodes/compare.tz michelson_test_scripts/opcodes/compare_big_type.tz michelson_test_scripts/opcodes/compare_big_type2.tz michelson_test_scripts/opcodes/comparisons.tz michelson_test_scripts/opcodes/concat_hello.tz michelson_test_scripts/opcodes/concat_hello_bytes.tz michelson_test_scripts/opcodes/concat_list.tz michelson_test_scripts/opcodes/cons.tz michelson_test_scripts/opcodes/contains_all.tz michelson_test_scripts/opcodes/contract.tz michelson_test_scripts/opcodes/create_contract.tz michelson_test_scripts/opcodes/create_contract_rootname.tz michelson_test_scripts/opcodes/create_contract_rootname_alt.tz michelson_test_scripts/opcodes/create_contract_with_view.tz michelson_test_scripts/opcodes/diff_timestamps.tz michelson_test_scripts/opcodes/dig_eq.tz michelson_test_scripts/opcodes/dign.tz michelson_test_scripts/opcodes/dip.tz michelson_test_scripts/opcodes/dipn.tz michelson_test_scripts/opcodes/dropn.tz michelson_test_scripts/opcodes/dugn.tz michelson_test_scripts/opcodes/dup-n.tz michelson_test_scripts/opcodes/ediv.tz michelson_test_scripts/opcodes/ediv_mutez.tz michelson_test_scripts/opcodes/emit.tz michelson_test_scripts/opcodes/empty_map.tz michelson_test_scripts/opcodes/exec_concat.tz michelson_test_scripts/opcodes/fact.tz michelson_test_scripts/opcodes/first.tz michelson_test_scripts/opcodes/get_and_update_big_map.tz michelson_test_scripts/opcodes/get_and_update_map.tz michelson_test_scripts/opcodes/get_big_map_value.tz michelson_test_scripts/opcodes/get_map_value.tz michelson_test_scripts/opcodes/hash_consistency_checker.tz michelson_test_scripts/opcodes/hash_key.tz michelson_test_scripts/opcodes/hash_string.tz michelson_test_scripts/opcodes/if.tz michelson_test_scripts/opcodes/if_some.tz michelson_test_scripts/opcodes/int.tz michelson_test_scripts/opcodes/iter_fail.tz michelson_test_scripts/opcodes/keccak.tz michelson_test_scripts/opcodes/left_right.tz michelson_test_scripts/opcodes/level.tz michelson_test_scripts/opcodes/list_concat.tz michelson_test_scripts/opcodes/list_concat_bytes.tz michelson_test_scripts/opcodes/list_id.tz michelson_test_scripts/opcodes/list_id_map.tz michelson_test_scripts/opcodes/list_iter.tz michelson_test_scripts/opcodes/list_map_block.tz michelson_test_scripts/opcodes/list_size.tz michelson_test_scripts/opcodes/loop_failwith.tz michelson_test_scripts/opcodes/loop_left.tz michelson_test_scripts/opcodes/loop_left_failwith.tz michelson_test_scripts/opcodes/lsl_bytes_016.tz michelson_test_scripts/opcodes/lsr_bytes_016.tz michelson_test_scripts/opcodes/map_car.tz michelson_test_scripts/opcodes/map_id.tz michelson_test_scripts/opcodes/map_iter.tz michelson_test_scripts/opcodes/map_map.tz michelson_test_scripts/opcodes/map_map_sideeffect.tz michelson_test_scripts/opcodes/map_mem_nat.tz michelson_test_scripts/opcodes/map_mem_string.tz michelson_test_scripts/opcodes/map_size.tz michelson_test_scripts/opcodes/merge_comparable_pairs.tz michelson_test_scripts/opcodes/mul.tz michelson_test_scripts/opcodes/mul_bls12_381_fr.tz michelson_test_scripts/opcodes/mul_bls12_381_g1.tz michelson_test_scripts/opcodes/mul_bls12_381_g2.tz michelson_test_scripts/opcodes/mul_overflow.tz michelson_test_scripts/opcodes/munch.tz michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz michelson_test_scripts/opcodes/neg.tz michelson_test_scripts/opcodes/neg_bls12_381_fr.tz michelson_test_scripts/opcodes/neg_bls12_381_g1.tz michelson_test_scripts/opcodes/neg_bls12_381_g2.tz michelson_test_scripts/opcodes/none.tz michelson_test_scripts/opcodes/noop.tz michelson_test_scripts/opcodes/not.tz michelson_test_scripts/opcodes/not_binary.tz michelson_test_scripts/opcodes/not_bytes_016.tz michelson_test_scripts/opcodes/or.tz michelson_test_scripts/opcodes/or_binary.tz michelson_test_scripts/opcodes/or_bytes_016.tz michelson_test_scripts/opcodes/originate_big_map.tz michelson_test_scripts/opcodes/packunpack.tz michelson_test_scripts/opcodes/packunpack_rev.tz michelson_test_scripts/opcodes/packunpack_rev_cty.tz michelson_test_scripts/opcodes/pair_id.tz michelson_test_scripts/opcodes/pairing_check.tz michelson_test_scripts/opcodes/pexec.tz michelson_test_scripts/opcodes/pexec_2.tz michelson_test_scripts/opcodes/proxy.tz michelson_test_scripts/opcodes/ret_int.tz michelson_test_scripts/opcodes/reverse.tz michelson_test_scripts/opcodes/reverse_loop.tz michelson_test_scripts/opcodes/sapling_empty_state.tz michelson_test_scripts/opcodes/self.tz michelson_test_scripts/opcodes/self_address.tz michelson_test_scripts/opcodes/self_address_after_fib_view.tz michelson_test_scripts/opcodes/self_address_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_address_after_view.tz michelson_test_scripts/opcodes/self_after_fib_view.tz michelson_test_scripts/opcodes/self_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_after_view.tz michelson_test_scripts/opcodes/self_with_default_entrypoint.tz michelson_test_scripts/opcodes/self_with_entrypoint.tz michelson_test_scripts/opcodes/sender.tz michelson_test_scripts/opcodes/sender_after_fib_view.tz michelson_test_scripts/opcodes/sender_after_nonexistent_view.tz michelson_test_scripts/opcodes/sender_after_view.tz michelson_test_scripts/opcodes/set_car.tz michelson_test_scripts/opcodes/set_cdr.tz michelson_test_scripts/opcodes/set_delegate.tz michelson_test_scripts/opcodes/set_id.tz michelson_test_scripts/opcodes/set_iter.tz michelson_test_scripts/opcodes/set_member.tz michelson_test_scripts/opcodes/set_size.tz michelson_test_scripts/opcodes/sets.tz michelson_test_scripts/opcodes/sha3.tz michelson_test_scripts/opcodes/shifts.tz michelson_test_scripts/opcodes/slice.tz michelson_test_scripts/opcodes/slice_bytes.tz michelson_test_scripts/opcodes/slices.tz michelson_test_scripts/opcodes/source.tz michelson_test_scripts/opcodes/split_bytes.tz michelson_test_scripts/opcodes/split_string.tz michelson_test_scripts/opcodes/store_bls12_381_fr.tz michelson_test_scripts/opcodes/store_bls12_381_g1.tz michelson_test_scripts/opcodes/store_bls12_381_g2.tz michelson_test_scripts/opcodes/store_input.tz michelson_test_scripts/opcodes/store_now.tz michelson_test_scripts/opcodes/str_id.tz michelson_test_scripts/opcodes/sub_timestamp_delta.tz michelson_test_scripts/opcodes/subset.tz michelson_test_scripts/opcodes/tez_add_sub.tz michelson_test_scripts/opcodes/ticket_bad.tz michelson_test_scripts/opcodes/ticket_big_store.tz michelson_test_scripts/opcodes/ticket_join.tz michelson_test_scripts/opcodes/ticket_read.tz michelson_test_scripts/opcodes/ticket_split.tz michelson_test_scripts/opcodes/ticket_store.tz michelson_test_scripts/opcodes/ticket_store-2.tz michelson_test_scripts/opcodes/ticketer.tz michelson_test_scripts/opcodes/ticketer-2.tz michelson_test_scripts/opcodes/transfer_amount.tz michelson_test_scripts/opcodes/transfer_tokens.tz michelson_test_scripts/opcodes/uncomb.tz michelson_test_scripts/opcodes/unpair.tz michelson_test_scripts/opcodes/unpair_field_annotation_mismatch.tz michelson_test_scripts/opcodes/update_big_map.tz michelson_test_scripts/opcodes/utxo_read.tz michelson_test_scripts/opcodes/utxor.tz michelson_test_scripts/opcodes/view_fib.tz michelson_test_scripts/opcodes/view_mutual_recursion.tz michelson_test_scripts/opcodes/view_op_add.tz michelson_test_scripts/opcodes/view_op_constant.tz michelson_test_scripts/opcodes/view_op_id.tz michelson_test_scripts/opcodes/view_op_nonexistent_addr.tz michelson_test_scripts/opcodes/view_op_nonexistent_func.tz michelson_test_scripts/opcodes/view_op_test_step_contants.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_input_type.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_output_type.tz michelson_test_scripts/opcodes/view_rec.tz michelson_test_scripts/opcodes/view_toplevel_lib.tz michelson_test_scripts/opcodes/voting_power.tz michelson_test_scripts/opcodes/xor.tz michelson_test_scripts/opcodes/xor_bytes_016.tz --details --display-names
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings typecheck script michelson_test_scripts/attic/accounts.tz michelson_test_scripts/attic/add1.tz michelson_test_scripts/attic/add1_list.tz michelson_test_scripts/attic/after_strategy.tz michelson_test_scripts/attic/always.tz michelson_test_scripts/attic/append.tz michelson_test_scripts/attic/at_least.tz michelson_test_scripts/attic/auction.tz michelson_test_scripts/attic/bad_lockup.tz michelson_test_scripts/attic/big_map_union.tz michelson_test_scripts/attic/cadr_annotation.tz michelson_test_scripts/attic/concat.tz michelson_test_scripts/attic/conditionals.tz michelson_test_scripts/attic/cons_twice.tz michelson_test_scripts/attic/cps_fact.tz michelson_test_scripts/attic/create_add1_lists.tz michelson_test_scripts/attic/data_publisher.tz michelson_test_scripts/attic/dispatch.tz michelson_test_scripts/attic/empty.tz michelson_test_scripts/attic/fail_amount.tz michelson_test_scripts/attic/faucet.tz michelson_test_scripts/attic/forward.tz michelson_test_scripts/attic/id.tz michelson_test_scripts/attic/infinite_loop.tz michelson_test_scripts/attic/insertion_sort.tz michelson_test_scripts/attic/int_publisher.tz michelson_test_scripts/attic/king_of_tez.tz michelson_test_scripts/attic/list_of_transactions.tz michelson_test_scripts/attic/queue.tz michelson_test_scripts/attic/reduce_map.tz michelson_test_scripts/attic/reentrancy.tz michelson_test_scripts/attic/reservoir.tz michelson_test_scripts/attic/scrutable_reservoir.tz michelson_test_scripts/attic/spawn_identities.tz michelson_test_scripts/entrypoints/big_map_entrypoints.tz michelson_test_scripts/entrypoints/delegatable_target.tz michelson_test_scripts/entrypoints/manager.tz michelson_test_scripts/entrypoints/no_default_target.tz michelson_test_scripts/entrypoints/no_entrypoint_target.tz michelson_test_scripts/entrypoints/rooted_target.tz michelson_test_scripts/entrypoints/simple_entrypoints.tz michelson_test_scripts/macros/assert.tz michelson_test_scripts/macros/assert_cmpeq.tz michelson_test_scripts/macros/assert_cmpge.tz michelson_test_scripts/macros/assert_cmpgt.tz michelson_test_scripts/macros/assert_cmple.tz michelson_test_scripts/macros/assert_cmplt.tz michelson_test_scripts/macros/assert_cmpneq.tz michelson_test_scripts/macros/assert_eq.tz michelson_test_scripts/macros/assert_ge.tz michelson_test_scripts/macros/assert_gt.tz michelson_test_scripts/macros/assert_le.tz michelson_test_scripts/macros/assert_lt.tz michelson_test_scripts/macros/assert_neq.tz michelson_test_scripts/macros/big_map_get_add.tz michelson_test_scripts/macros/big_map_mem.tz michelson_test_scripts/macros/build_list.tz michelson_test_scripts/macros/carn_and_cdrn.tz michelson_test_scripts/macros/compare.tz michelson_test_scripts/macros/compare_bytes.tz michelson_test_scripts/macros/fail.tz michelson_test_scripts/macros/guestbook.tz michelson_test_scripts/macros/macro_annotations.tz michelson_test_scripts/macros/map_caddaadr.tz michelson_test_scripts/macros/max_in_list.tz michelson_test_scripts/macros/min.tz michelson_test_scripts/macros/pair_macro.tz michelson_test_scripts/macros/set_caddaadr.tz michelson_test_scripts/macros/take_my_money.tz michelson_test_scripts/macros/unpair_macro.tz michelson_test_scripts/mini_scenarios/999_constant.tz michelson_test_scripts/mini_scenarios/add_clear_tickets_015.tz michelson_test_scripts/mini_scenarios/always_fails.tz michelson_test_scripts/mini_scenarios/authentication.tz michelson_test_scripts/mini_scenarios/big_map_all.tz michelson_test_scripts/mini_scenarios/big_map_entrypoints.tz michelson_test_scripts/mini_scenarios/big_map_magic.tz michelson_test_scripts/mini_scenarios/big_map_read.tz michelson_test_scripts/mini_scenarios/big_map_store.tz michelson_test_scripts/mini_scenarios/big_map_write.tz michelson_test_scripts/mini_scenarios/cache_consistency.tz michelson_test_scripts/mini_scenarios/check_signature.tz michelson_test_scripts/mini_scenarios/constant_entrypoints.tz michelson_test_scripts/mini_scenarios/constant_unit.tz michelson_test_scripts/mini_scenarios/create_contract.tz michelson_test_scripts/mini_scenarios/create_contract_simple.tz michelson_test_scripts/mini_scenarios/default_account.tz michelson_test_scripts/mini_scenarios/emit_events.tz michelson_test_scripts/mini_scenarios/execution_order_appender.tz michelson_test_scripts/mini_scenarios/execution_order_caller.tz michelson_test_scripts/mini_scenarios/execution_order_storer.tz michelson_test_scripts/mini_scenarios/fa12_reference.tz michelson_test_scripts/mini_scenarios/fail_on_false.tz michelson_test_scripts/mini_scenarios/generic_multisig.tz michelson_test_scripts/mini_scenarios/groth16.tz michelson_test_scripts/mini_scenarios/hardlimit.tz michelson_test_scripts/mini_scenarios/large_error.tz michelson_test_scripts/mini_scenarios/large_flat_contract.tz michelson_test_scripts/mini_scenarios/large_str_id.tz michelson_test_scripts/mini_scenarios/legacy_multisig.tz michelson_test_scripts/mini_scenarios/lockup.tz michelson_test_scripts/mini_scenarios/loop.tz michelson_test_scripts/mini_scenarios/lqt_fa12.mligo.tz michelson_test_scripts/mini_scenarios/multiple_en2.tz michelson_test_scripts/mini_scenarios/multiple_entrypoints_counter.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint_arg.tz michelson_test_scripts/mini_scenarios/nat_id.tz michelson_test_scripts/mini_scenarios/noop_bytes.tz michelson_test_scripts/mini_scenarios/originate_contract.tz michelson_test_scripts/mini_scenarios/parameterized_multisig.tz michelson_test_scripts/mini_scenarios/parsable_contract.tz michelson_test_scripts/mini_scenarios/receive_tickets_in_big_map.tz michelson_test_scripts/mini_scenarios/replay.tz michelson_test_scripts/mini_scenarios/reveal_signed_preimage.tz michelson_test_scripts/mini_scenarios/sc_rollup_forward.tz michelson_test_scripts/mini_scenarios/sc_rollup_mint_and_forward.tz michelson_test_scripts/mini_scenarios/self_address_receiver.tz michelson_test_scripts/mini_scenarios/self_address_sender.tz michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz michelson_test_scripts/mini_scenarios/send_ticket_list_multiple_016.tz michelson_test_scripts/mini_scenarios/send_tickets_from_storage_016.tz michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz michelson_test_scripts/mini_scenarios/smart_rollup_mint_and_deposit_ticket_016.tz michelson_test_scripts/mini_scenarios/smart_rollup_receive_tickets_016.tz michelson_test_scripts/mini_scenarios/str_id.tz michelson_test_scripts/mini_scenarios/ticket_builder_fungible.tz michelson_test_scripts/mini_scenarios/ticket_builder_non_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_non_fungible.tz michelson_test_scripts/mini_scenarios/tickets_015.tz michelson_test_scripts/mini_scenarios/tickets_bag_016.tz michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz michelson_test_scripts/mini_scenarios/tickets_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_create_and_send_015.tz michelson_test_scripts/mini_scenarios/tickets_list_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_mint_and_store_complex_param.tz michelson_test_scripts/mini_scenarios/tickets_receive_and_store.tz michelson_test_scripts/mini_scenarios/tickets_send_016.tz michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz michelson_test_scripts/mini_scenarios/tickets_store_fst_and_rely_snd.tz michelson_test_scripts/mini_scenarios/tzip4_view.tz michelson_test_scripts/mini_scenarios/very_small.tz michelson_test_scripts/mini_scenarios/view_check_caller.tz michelson_test_scripts/mini_scenarios/view_registers_callers.tz michelson_test_scripts/mini_scenarios/viewable.tz michelson_test_scripts/mini_scenarios/vote_for_delegate.tz michelson_test_scripts/mini_scenarios/weather_insurance.tz michelson_test_scripts/mini_scenarios/xcat.tz michelson_test_scripts/mini_scenarios/xcat_dapp.tz michelson_test_scripts/non_regression/262_bug.tz michelson_test_scripts/non_regression/843_bug.tz michelson_test_scripts/non_regression/bad_annot_contract.tz michelson_test_scripts/non_regression/pairk_annot.tz michelson_test_scripts/opcodes/abs.tz michelson_test_scripts/opcodes/add.tz michelson_test_scripts/opcodes/add_bls12_381_fr.tz michelson_test_scripts/opcodes/add_bls12_381_g1.tz michelson_test_scripts/opcodes/add_bls12_381_g2.tz michelson_test_scripts/opcodes/add_delta_timestamp.tz michelson_test_scripts/opcodes/add_timestamp_delta.tz michelson_test_scripts/opcodes/address.tz michelson_test_scripts/opcodes/amount_after_fib_view.tz michelson_test_scripts/opcodes/amount_after_nonexistent_view.tz michelson_test_scripts/opcodes/amount_after_view.tz michelson_test_scripts/opcodes/and.tz michelson_test_scripts/opcodes/and_binary.tz michelson_test_scripts/opcodes/and_bytes_016.tz michelson_test_scripts/opcodes/and_logical_1.tz michelson_test_scripts/opcodes/balance.tz michelson_test_scripts/opcodes/balance_after_fib_view.tz michelson_test_scripts/opcodes/balance_after_nonexistent_view.tz michelson_test_scripts/opcodes/balance_after_view.tz michelson_test_scripts/opcodes/big_map_mem_nat.tz michelson_test_scripts/opcodes/big_map_mem_string.tz michelson_test_scripts/opcodes/big_map_to_self.tz michelson_test_scripts/opcodes/bls12_381_fr_push_bytes_not_padded.tz michelson_test_scripts/opcodes/bls12_381_fr_push_nat.tz michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz michelson_test_scripts/opcodes/bls12_381_fr_to_mutez.tz michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz michelson_test_scripts/opcodes/bytes.tz michelson_test_scripts/opcodes/bytes_of_int_016.tz michelson_test_scripts/opcodes/bytes_of_nat_016.tz michelson_test_scripts/opcodes/car.tz michelson_test_scripts/opcodes/cdr.tz michelson_test_scripts/opcodes/chain_id.tz michelson_test_scripts/opcodes/chain_id_store.tz michelson_test_scripts/opcodes/check_signature.tz michelson_test_scripts/opcodes/comb.tz michelson_test_scripts/opcodes/comb-get.tz michelson_test_scripts/opcodes/comb-literals.tz michelson_test_scripts/opcodes/comb-set.tz michelson_test_scripts/opcodes/comb-set-2.tz michelson_test_scripts/opcodes/compare.tz michelson_test_scripts/opcodes/compare_big_type.tz michelson_test_scripts/opcodes/compare_big_type2.tz michelson_test_scripts/opcodes/comparisons.tz michelson_test_scripts/opcodes/concat_hello.tz michelson_test_scripts/opcodes/concat_hello_bytes.tz michelson_test_scripts/opcodes/concat_list.tz michelson_test_scripts/opcodes/cons.tz michelson_test_scripts/opcodes/contains_all.tz michelson_test_scripts/opcodes/contract.tz michelson_test_scripts/opcodes/create_contract.tz michelson_test_scripts/opcodes/create_contract_rootname.tz michelson_test_scripts/opcodes/create_contract_rootname_alt.tz michelson_test_scripts/opcodes/create_contract_with_view.tz michelson_test_scripts/opcodes/diff_timestamps.tz michelson_test_scripts/opcodes/dig_eq.tz michelson_test_scripts/opcodes/dign.tz michelson_test_scripts/opcodes/dip.tz michelson_test_scripts/opcodes/dipn.tz michelson_test_scripts/opcodes/dropn.tz michelson_test_scripts/opcodes/dugn.tz michelson_test_scripts/opcodes/dup-n.tz michelson_test_scripts/opcodes/ediv.tz michelson_test_scripts/opcodes/ediv_mutez.tz michelson_test_scripts/opcodes/emit.tz michelson_test_scripts/opcodes/empty_map.tz michelson_test_scripts/opcodes/exec_concat.tz michelson_test_scripts/opcodes/fact.tz michelson_test_scripts/opcodes/first.tz michelson_test_scripts/opcodes/get_and_update_big_map.tz michelson_test_scripts/opcodes/get_and_update_map.tz michelson_test_scripts/opcodes/get_big_map_value.tz michelson_test_scripts/opcodes/get_map_value.tz michelson_test_scripts/opcodes/hash_consistency_checker.tz michelson_test_scripts/opcodes/hash_key.tz michelson_test_scripts/opcodes/hash_string.tz michelson_test_scripts/opcodes/if.tz michelson_test_scripts/opcodes/if_some.tz michelson_test_scripts/opcodes/int.tz michelson_test_scripts/opcodes/iter_fail.tz michelson_test_scripts/opcodes/keccak.tz michelson_test_scripts/opcodes/left_right.tz michelson_test_scripts/opcodes/level.tz michelson_test_scripts/opcodes/list_concat.tz michelson_test_scripts/opcodes/list_concat_bytes.tz michelson_test_scripts/opcodes/list_id.tz michelson_test_scripts/opcodes/list_id_map.tz michelson_test_scripts/opcodes/list_iter.tz michelson_test_scripts/opcodes/list_map_block.tz michelson_test_scripts/opcodes/list_size.tz michelson_test_scripts/opcodes/loop_failwith.tz michelson_test_scripts/opcodes/loop_left.tz michelson_test_scripts/opcodes/loop_left_failwith.tz michelson_test_scripts/opcodes/lsl_bytes_016.tz michelson_test_scripts/opcodes/lsr_bytes_016.tz michelson_test_scripts/opcodes/map_car.tz michelson_test_scripts/opcodes/map_id.tz michelson_test_scripts/opcodes/map_iter.tz michelson_test_scripts/opcodes/map_map.tz michelson_test_scripts/opcodes/map_map_sideeffect.tz michelson_test_scripts/opcodes/map_mem_nat.tz michelson_test_scripts/opcodes/map_mem_string.tz michelson_test_scripts/opcodes/map_size.tz michelson_test_scripts/opcodes/merge_comparable_pairs.tz michelson_test_scripts/opcodes/mul.tz michelson_test_scripts/opcodes/mul_bls12_381_fr.tz michelson_test_scripts/opcodes/mul_bls12_381_g1.tz michelson_test_scripts/opcodes/mul_bls12_381_g2.tz michelson_test_scripts/opcodes/mul_overflow.tz michelson_test_scripts/opcodes/munch.tz michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz michelson_test_scripts/opcodes/neg.tz michelson_test_scripts/opcodes/neg_bls12_381_fr.tz michelson_test_scripts/opcodes/neg_bls12_381_g1.tz michelson_test_scripts/opcodes/neg_bls12_381_g2.tz michelson_test_scripts/opcodes/none.tz michelson_test_scripts/opcodes/noop.tz michelson_test_scripts/opcodes/not.tz michelson_test_scripts/opcodes/not_binary.tz michelson_test_scripts/opcodes/not_bytes_016.tz michelson_test_scripts/opcodes/or.tz michelson_test_scripts/opcodes/or_binary.tz michelson_test_scripts/opcodes/or_bytes_016.tz michelson_test_scripts/opcodes/originate_big_map.tz michelson_test_scripts/opcodes/packunpack.tz michelson_test_scripts/opcodes/packunpack_rev.tz michelson_test_scripts/opcodes/packunpack_rev_cty.tz michelson_test_scripts/opcodes/pair_id.tz michelson_test_scripts/opcodes/pairing_check.tz michelson_test_scripts/opcodes/pexec.tz michelson_test_scripts/opcodes/pexec_2.tz michelson_test_scripts/opcodes/proxy.tz michelson_test_scripts/opcodes/ret_int.tz michelson_test_scripts/opcodes/reverse.tz michelson_test_scripts/opcodes/reverse_loop.tz michelson_test_scripts/opcodes/sapling_empty_state.tz michelson_test_scripts/opcodes/self.tz michelson_test_scripts/opcodes/self_address.tz michelson_test_scripts/opcodes/self_address_after_fib_view.tz michelson_test_scripts/opcodes/self_address_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_address_after_view.tz michelson_test_scripts/opcodes/self_after_fib_view.tz michelson_test_scripts/opcodes/self_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_after_view.tz michelson_test_scripts/opcodes/self_with_default_entrypoint.tz michelson_test_scripts/opcodes/self_with_entrypoint.tz michelson_test_scripts/opcodes/sender.tz michelson_test_scripts/opcodes/sender_after_fib_view.tz michelson_test_scripts/opcodes/sender_after_nonexistent_view.tz michelson_test_scripts/opcodes/sender_after_view.tz michelson_test_scripts/opcodes/set_car.tz michelson_test_scripts/opcodes/set_cdr.tz michelson_test_scripts/opcodes/set_delegate.tz michelson_test_scripts/opcodes/set_id.tz michelson_test_scripts/opcodes/set_iter.tz michelson_test_scripts/opcodes/set_member.tz michelson_test_scripts/opcodes/set_size.tz michelson_test_scripts/opcodes/sets.tz michelson_test_scripts/opcodes/sha3.tz michelson_test_scripts/opcodes/shifts.tz michelson_test_scripts/opcodes/slice.tz michelson_test_scripts/opcodes/slice_bytes.tz michelson_test_scripts/opcodes/slices.tz michelson_test_scripts/opcodes/source.tz michelson_test_scripts/opcodes/split_bytes.tz michelson_test_scripts/opcodes/split_string.tz michelson_test_scripts/opcodes/store_bls12_381_fr.tz michelson_test_scripts/opcodes/store_bls12_381_g1.tz michelson_test_scripts/opcodes/store_bls12_381_g2.tz michelson_test_scripts/opcodes/store_input.tz michelson_test_scripts/opcodes/store_now.tz michelson_test_scripts/opcodes/str_id.tz michelson_test_scripts/opcodes/sub_timestamp_delta.tz michelson_test_scripts/opcodes/subset.tz michelson_test_scripts/opcodes/tez_add_sub.tz michelson_test_scripts/opcodes/ticket_bad.tz michelson_test_scripts/opcodes/ticket_big_store.tz michelson_test_scripts/opcodes/ticket_join.tz michelson_test_scripts/opcodes/ticket_read.tz michelson_test_scripts/opcodes/ticket_split.tz michelson_test_scripts/opcodes/ticket_store.tz michelson_test_scripts/opcodes/ticket_store-2.tz michelson_test_scripts/opcodes/ticketer.tz michelson_test_scripts/opcodes/ticketer-2.tz michelson_test_scripts/opcodes/transfer_amount.tz michelson_test_scripts/opcodes/transfer_tokens.tz michelson_test_scripts/opcodes/uncomb.tz michelson_test_scripts/opcodes/unpair.tz michelson_test_scripts/opcodes/unpair_field_annotation_mismatch.tz michelson_test_scripts/opcodes/update_big_map.tz michelson_test_scripts/opcodes/utxo_read.tz michelson_test_scripts/opcodes/utxor.tz michelson_test_scripts/opcodes/view_fib.tz michelson_test_scripts/opcodes/view_mutual_recursion.tz michelson_test_scripts/opcodes/view_op_add.tz michelson_test_scripts/opcodes/view_op_constant.tz michelson_test_scripts/opcodes/view_op_id.tz michelson_test_scripts/opcodes/view_op_nonexistent_addr.tz michelson_test_scripts/opcodes/view_op_nonexistent_func.tz michelson_test_scripts/opcodes/view_op_test_step_contants.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_input_type.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_output_type.tz michelson_test_scripts/opcodes/view_rec.tz michelson_test_scripts/opcodes/view_toplevel_lib.tz michelson_test_scripts/opcodes/voting_power.tz michelson_test_scripts/opcodes/xor.tz michelson_test_scripts/opcodes/xor_bytes_016.tz --details --display-names
 Well typed (Gas remaining: 1039933.430 units remaining)	michelson_test_scripts/attic/accounts.tz
 { parameter
     (or (key_hash %Initialize)
diff --git a/tezt/tests/expected/sc_rollup.ml/Paris- arith - participant of a refutation game are slashed-rewarded.out b/tezt/tests/expected/sc_rollup.ml/Paris- arith - participant of a refutation game are slashed-rewarded.out
index fee7b1b79ddf116b145bf0d82de42f2e90b0999e..dd1dc9010ea43fd66d595a85e74b29844218cf86 100644
--- a/tezt/tests/expected/sc_rollup.ml/Paris- arith - participant of a refutation game are slashed-rewarded.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Paris- 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
diff --git a/tezt/tests/expected/tzt_regression.ml/Paris- Run TZT.out b/tezt/tests/expected/tzt_regression.ml/Paris- Run TZT.out
index bdeb72da00e1f32699df85edc4721e5dec330b54..7af322b174a357a453ee97c18edd80fbde57620b 100644
--- a/tezt/tests/expected/tzt_regression.ml/Paris- Run TZT.out	
+++ b/tezt/tests/expected/tzt_regression.ml/Paris- Run TZT.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol PtParisAeco71sYvYgfnVPb4rRJe6zgzYRDS5U8t5ednSRPUFN5 --mode mockup --no-base-dir-warnings run unit tests from tzt_reference_test_suite/abs_00.tzt tzt_reference_test_suite/abs_01.tzt tzt_reference_test_suite/abs_02.tzt tzt_reference_test_suite/add_00.tc.tzt tzt_reference_test_suite/add_01.tc.tzt tzt_reference_test_suite/add_int-int_00.tzt tzt_reference_test_suite/add_int-nat_00.tzt tzt_reference_test_suite/add_int-nat_01.tzt tzt_reference_test_suite/add_int-timestamp_00.tzt tzt_reference_test_suite/add_mutez-mutez_00.tzt tzt_reference_test_suite/add_mutez-mutez_01.tzt tzt_reference_test_suite/add_nat-int_00.tzt tzt_reference_test_suite/add_nat-nat_00.tzt tzt_reference_test_suite/add_timestamp-int_00.tzt tzt_reference_test_suite/add_timestamp-int_01.tzt tzt_reference_test_suite/add_timestamp-int_02.tzt tzt_reference_test_suite/add_timestamp-int_03.tzt tzt_reference_test_suite/address_00.tzt tzt_reference_test_suite/address_00.tc.tzt tzt_reference_test_suite/address_01.tzt tzt_reference_test_suite/address_02.tzt tzt_reference_test_suite/amount_00.tzt tzt_reference_test_suite/and_bool-bool_00.tzt tzt_reference_test_suite/and_bool-bool_01.tzt tzt_reference_test_suite/and_bool-bool_02.tzt tzt_reference_test_suite/and_bool-bool_03.tzt tzt_reference_test_suite/and_bytes-bytes_00.tzt tzt_reference_test_suite/and_bytes-bytes_01.tzt tzt_reference_test_suite/and_bytes-bytes_02.tzt tzt_reference_test_suite/and_bytes-bytes_03.tzt tzt_reference_test_suite/and_bytes-bytes_04.tzt tzt_reference_test_suite/and_bytes-bytes_05.tzt tzt_reference_test_suite/and_bytes-bytes_06.tzt tzt_reference_test_suite/and_int-nat_00.tzt tzt_reference_test_suite/and_int-nat_01.tzt tzt_reference_test_suite/and_int-nat_02.tzt tzt_reference_test_suite/and_int-nat_03.tzt tzt_reference_test_suite/and_int-nat_04.tzt tzt_reference_test_suite/and_int-nat_05.tzt tzt_reference_test_suite/and_int-nat_06.tzt tzt_reference_test_suite/and_nat-nat_00.tzt tzt_reference_test_suite/and_nat-nat_01.tzt tzt_reference_test_suite/and_nat-nat_02.tzt tzt_reference_test_suite/apply_00.tzt tzt_reference_test_suite/apply_01.tzt tzt_reference_test_suite/apply_02.tzt tzt_reference_test_suite/balance_00.tzt tzt_reference_test_suite/blake2b_00.tzt tzt_reference_test_suite/blake2b_01.tzt tzt_reference_test_suite/car_00.tzt tzt_reference_test_suite/car_00.tc.tzt tzt_reference_test_suite/car_01.tzt tzt_reference_test_suite/cdr_00.tzt tzt_reference_test_suite/cdr_00.tc.tzt tzt_reference_test_suite/cdr_01.tzt tzt_reference_test_suite/chain_id_00.tzt tzt_reference_test_suite/chain_id_01.tzt tzt_reference_test_suite/checksignature_00.tzt tzt_reference_test_suite/checksignature_00.tc.tzt tzt_reference_test_suite/checksignature_01.tzt tzt_reference_test_suite/compare_00.tc.tzt tzt_reference_test_suite/compare_01.tc.tzt tzt_reference_test_suite/compare_02.tc.tzt tzt_reference_test_suite/compare_bool_00.tzt tzt_reference_test_suite/compare_bool_01.tzt tzt_reference_test_suite/compare_bool_02.tzt tzt_reference_test_suite/compare_bool_03.tzt tzt_reference_test_suite/compare_bytes_00.tzt tzt_reference_test_suite/compare_bytes_01.tzt tzt_reference_test_suite/compare_bytes_02.tzt tzt_reference_test_suite/compare_bytes_03.tzt tzt_reference_test_suite/compare_bytes_04.tzt tzt_reference_test_suite/compare_int_00.tzt tzt_reference_test_suite/compare_int_01.tzt tzt_reference_test_suite/compare_int_02.tzt tzt_reference_test_suite/compare_int_03.tzt tzt_reference_test_suite/compare_int_04.tzt tzt_reference_test_suite/compare_keyhash_00.tzt tzt_reference_test_suite/compare_keyhash_01.tzt tzt_reference_test_suite/compare_keyhash_02.tzt tzt_reference_test_suite/compare_mutez_00.tzt tzt_reference_test_suite/compare_mutez_01.tzt tzt_reference_test_suite/compare_mutez_02.tzt tzt_reference_test_suite/compare_mutez_03.tzt tzt_reference_test_suite/compare_mutez_04.tzt tzt_reference_test_suite/compare_mutez_05.tzt tzt_reference_test_suite/compare_nat_00.tzt tzt_reference_test_suite/compare_nat_01.tzt tzt_reference_test_suite/compare_nat_02.tzt tzt_reference_test_suite/compare_nat_03.tzt tzt_reference_test_suite/compare_nat_04.tzt tzt_reference_test_suite/compare_nat_05.tzt tzt_reference_test_suite/compare_never_00.tzt tzt_reference_test_suite/compare_pairintint_00.tzt tzt_reference_test_suite/compare_pairintint_01.tzt tzt_reference_test_suite/compare_pairintint_02.tzt tzt_reference_test_suite/compare_pairintint_03.tzt tzt_reference_test_suite/compare_string_00.tzt tzt_reference_test_suite/compare_string_01.tzt tzt_reference_test_suite/compare_string_02.tzt tzt_reference_test_suite/compare_string_03.tzt tzt_reference_test_suite/compare_string_04.tzt tzt_reference_test_suite/compare_timestamp_00.tzt tzt_reference_test_suite/compare_timestamp_01.tzt tzt_reference_test_suite/compare_timestamp_02.tzt tzt_reference_test_suite/compare_timestamp_03.tzt tzt_reference_test_suite/compare_timestamp_04.tzt tzt_reference_test_suite/compare_timestamp_05.tzt tzt_reference_test_suite/concat_00.tc.tzt tzt_reference_test_suite/concat_bytes_00.tzt tzt_reference_test_suite/concat_bytes_01.tzt tzt_reference_test_suite/concat_listbytes_00.tzt tzt_reference_test_suite/concat_listbytes_01.tzt tzt_reference_test_suite/concat_listbytes_02.tzt tzt_reference_test_suite/concat_liststring_00.tzt tzt_reference_test_suite/concat_liststring_01.tzt tzt_reference_test_suite/concat_liststring_02.tzt tzt_reference_test_suite/concat_liststring_03.tzt tzt_reference_test_suite/concat_liststring_04.tzt tzt_reference_test_suite/concat_string_00.tzt tzt_reference_test_suite/concat_string_01.tzt tzt_reference_test_suite/concat_string_02.tzt tzt_reference_test_suite/cons_int_00.tzt tzt_reference_test_suite/cons_int_01.tzt tzt_reference_test_suite/cons_int_02.tzt tzt_reference_test_suite/cons_lists_00.tc.tzt tzt_reference_test_suite/cons_string_00.tzt tzt_reference_test_suite/contract_00.tzt tzt_reference_test_suite/contract_01.tzt tzt_reference_test_suite/contract_02.tzt tzt_reference_test_suite/contract_03.tzt tzt_reference_test_suite/contract_04.tzt tzt_reference_test_suite/contract_05.tzt tzt_reference_test_suite/createcontract_00.tzt tzt_reference_test_suite/createcontract_01.tzt tzt_reference_test_suite/dig_00.tzt tzt_reference_test_suite/dig_01.tzt tzt_reference_test_suite/dig_02.tzt tzt_reference_test_suite/dig_03.tzt tzt_reference_test_suite/dig_04.tzt tzt_reference_test_suite/dip_00.tzt tzt_reference_test_suite/dip_00.tc.tzt tzt_reference_test_suite/dip_01.tzt tzt_reference_test_suite/dip_02.tzt tzt_reference_test_suite/dipn_00.tzt tzt_reference_test_suite/dipn_00.tc.tzt tzt_reference_test_suite/dipn_01.tzt tzt_reference_test_suite/dipn_01.tc.tzt tzt_reference_test_suite/dipn_02.tzt tzt_reference_test_suite/dipn_02.tc.tzt tzt_reference_test_suite/dipn_03.tzt tzt_reference_test_suite/drop_00.tzt tzt_reference_test_suite/drop_00.tc.tzt tzt_reference_test_suite/dropn_00.tzt tzt_reference_test_suite/dropn_00.tc.tzt tzt_reference_test_suite/dropn_01.tzt tzt_reference_test_suite/dropn_02.tzt tzt_reference_test_suite/dropn_03.tzt tzt_reference_test_suite/dugn_00.tzt tzt_reference_test_suite/dup_00.tzt tzt_reference_test_suite/dup_00.tc.tzt tzt_reference_test_suite/dupn_00.tzt tzt_reference_test_suite/dupn_00.tc.tzt tzt_reference_test_suite/dupn_01.tzt tzt_reference_test_suite/dupn_01.tc.tzt tzt_reference_test_suite/dupn_02.tzt tzt_reference_test_suite/dupn_03.tzt tzt_reference_test_suite/dupn_04.tzt tzt_reference_test_suite/ediv_int-int_00.tzt tzt_reference_test_suite/ediv_int-int_01.tzt tzt_reference_test_suite/ediv_int-int_02.tzt tzt_reference_test_suite/ediv_int-int_03.tzt tzt_reference_test_suite/ediv_mutez-mutez_00.tzt tzt_reference_test_suite/ediv_mutez-mutez_01.tzt tzt_reference_test_suite/ediv_mutez-mutez_02.tzt tzt_reference_test_suite/ediv_mutez-mutez_03.tzt tzt_reference_test_suite/ediv_mutez-nat_00.tzt tzt_reference_test_suite/ediv_mutez-nat_01.tzt tzt_reference_test_suite/ediv_mutez-nat_02.tzt tzt_reference_test_suite/ediv_mutez-nat_03.tzt tzt_reference_test_suite/ediv_mutez-nat_04.tzt tzt_reference_test_suite/ediv_mutez-nat_05.tzt tzt_reference_test_suite/ediv_mutez-nat_06.tzt tzt_reference_test_suite/emptybigmap_nat-nat_00.tzt tzt_reference_test_suite/emptymap_nat-nat_00.tzt tzt_reference_test_suite/emptymap_string-string_00.tzt tzt_reference_test_suite/emptyset_00.tc.tzt tzt_reference_test_suite/emptyset_nat_00.tzt tzt_reference_test_suite/eq_00.tzt tzt_reference_test_suite/eq_01.tzt tzt_reference_test_suite/eq_02.tzt tzt_reference_test_suite/eq_03.tzt tzt_reference_test_suite/eq_04.tzt tzt_reference_test_suite/exec_00.tzt tzt_reference_test_suite/exec_01.tzt tzt_reference_test_suite/exec_02.tzt tzt_reference_test_suite/exec_03.tzt tzt_reference_test_suite/failwith_00.tzt tzt_reference_test_suite/failwith_00.tc.tzt tzt_reference_test_suite/gas_exhaustion.tzt tzt_reference_test_suite/ge_00.tzt tzt_reference_test_suite/ge_01.tzt tzt_reference_test_suite/ge_02.tzt tzt_reference_test_suite/ge_03.tzt tzt_reference_test_suite/ge_04.tzt tzt_reference_test_suite/get_00.tc.tzt tzt_reference_test_suite/get_bigmapstringstring_00.tzt tzt_reference_test_suite/get_bigmapstringstring_01.tzt tzt_reference_test_suite/get_bigmapstringstring_02.tzt tzt_reference_test_suite/get_map_00.tc.tzt tzt_reference_test_suite/get_mapintint_00.tzt tzt_reference_test_suite/get_mapintint_01.tzt tzt_reference_test_suite/get_mapstringstring_00.tzt tzt_reference_test_suite/get_mapstringstring_01.tzt tzt_reference_test_suite/get_mapstringstring_02.tzt tzt_reference_test_suite/gt_00.tzt tzt_reference_test_suite/gt_00.tc.tzt tzt_reference_test_suite/gt_01.tzt tzt_reference_test_suite/gt_02.tzt tzt_reference_test_suite/gt_03.tzt tzt_reference_test_suite/gt_04.tzt tzt_reference_test_suite/if_00.tzt tzt_reference_test_suite/if_00.tc.tzt tzt_reference_test_suite/if_01.tzt tzt_reference_test_suite/if_01.tc.tzt tzt_reference_test_suite/ifcons_00.tc.tzt tzt_reference_test_suite/ifcons_listint_00.tzt tzt_reference_test_suite/ifcons_listint_01.tzt tzt_reference_test_suite/ifcons_listnat_00.tzt tzt_reference_test_suite/ifcons_listnat_01.tzt tzt_reference_test_suite/ifleft_00.tc.tzt tzt_reference_test_suite/ifleft_orintstring_00.tzt tzt_reference_test_suite/ifleft_orstringint_00.tzt tzt_reference_test_suite/ifnone_00.tc.tzt tzt_reference_test_suite/ifnone_optionint_00.tzt tzt_reference_test_suite/ifnone_optionnat_00.tzt tzt_reference_test_suite/implicitaccount_00.tzt tzt_reference_test_suite/int_00.tc.tzt tzt_reference_test_suite/int_nat_00.tzt tzt_reference_test_suite/int_nat_01.tzt tzt_reference_test_suite/isnat_00.tzt tzt_reference_test_suite/isnat_01.tzt tzt_reference_test_suite/iter_00.tc.tzt tzt_reference_test_suite/iter_listint_00.tzt tzt_reference_test_suite/iter_listint_01.tzt tzt_reference_test_suite/iter_listint_02.tzt tzt_reference_test_suite/iter_listint_03.tzt tzt_reference_test_suite/iter_liststring_00.tzt tzt_reference_test_suite/iter_liststring_01.tzt tzt_reference_test_suite/iter_mapintint_00.tzt tzt_reference_test_suite/iter_mapintint_01.tzt tzt_reference_test_suite/iter_mapintint_02.tzt tzt_reference_test_suite/iter_mapintint_03.tzt tzt_reference_test_suite/iter_mapintint_04.tzt tzt_reference_test_suite/iter_mapstringstring_00.tzt tzt_reference_test_suite/iter_setint_00.tzt tzt_reference_test_suite/iter_setint_01.tzt tzt_reference_test_suite/iter_setint_02.tzt tzt_reference_test_suite/iter_setstring_00.tzt tzt_reference_test_suite/iter_setstring_01.tzt tzt_reference_test_suite/iter_setstring_02.tzt tzt_reference_test_suite/join_tickets_00.tzt tzt_reference_test_suite/join_tickets_01.tzt tzt_reference_test_suite/join_tickets_02.tzt tzt_reference_test_suite/join_tickets_03.tzt tzt_reference_test_suite/keccak_00.tzt tzt_reference_test_suite/keccak_01.tzt tzt_reference_test_suite/le_00.tzt tzt_reference_test_suite/le_01.tzt tzt_reference_test_suite/le_02.tzt tzt_reference_test_suite/le_03.tzt tzt_reference_test_suite/le_04.tzt tzt_reference_test_suite/left_int-nat_00.tzt tzt_reference_test_suite/loop_00.tzt tzt_reference_test_suite/loop_00.tc.tzt tzt_reference_test_suite/loop_01.tzt tzt_reference_test_suite/loop_01.tc.tzt tzt_reference_test_suite/loop_02.tzt tzt_reference_test_suite/loopleft_00.tzt tzt_reference_test_suite/loopleft_01.tzt tzt_reference_test_suite/loopleft_02.tzt tzt_reference_test_suite/loopleft_03.tzt tzt_reference_test_suite/loopleft_04.tzt tzt_reference_test_suite/lsl_00.tzt tzt_reference_test_suite/lsl_01.tzt tzt_reference_test_suite/lsl_02.tzt tzt_reference_test_suite/lsl_03.tzt tzt_reference_test_suite/lsl_04.tzt tzt_reference_test_suite/lsl_05.tzt tzt_reference_test_suite/lsl_06.tzt tzt_reference_test_suite/lsr_00.tzt tzt_reference_test_suite/lsr_01.tzt tzt_reference_test_suite/lsr_02.tzt tzt_reference_test_suite/lsr_03.tzt tzt_reference_test_suite/lsr_04.tzt tzt_reference_test_suite/lsr_05.tzt tzt_reference_test_suite/lt_00.tzt tzt_reference_test_suite/lt_01.tzt tzt_reference_test_suite/lt_02.tzt tzt_reference_test_suite/lt_03.tzt tzt_reference_test_suite/lt_04.tzt tzt_reference_test_suite/macro_pack/assert_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpeq_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpge_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpgt_00.tzt tzt_reference_test_suite/macro_pack/assert_cmple_00.tzt tzt_reference_test_suite/macro_pack/assert_cmplt_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpneq_00.tzt tzt_reference_test_suite/macro_pack/assert_eq_00.tzt tzt_reference_test_suite/macro_pack/assert_ge_00.tzt tzt_reference_test_suite/macro_pack/assert_gt_00.tzt tzt_reference_test_suite/macro_pack/assert_le_00.tzt tzt_reference_test_suite/macro_pack/assert_left_00.tzt tzt_reference_test_suite/macro_pack/assert_lt_00.tzt tzt_reference_test_suite/macro_pack/assert_neq_00.tzt tzt_reference_test_suite/macro_pack/assert_none_00.tzt tzt_reference_test_suite/macro_pack/assert_right_00.tzt tzt_reference_test_suite/macro_pack/assert_some_00.tzt tzt_reference_test_suite/macro_pack/cadr_00.tzt tzt_reference_test_suite/macro_pack/carn_00.tzt tzt_reference_test_suite/macro_pack/carn_01.tzt tzt_reference_test_suite/macro_pack/cdrn_00.tzt tzt_reference_test_suite/macro_pack/cdrn_01.tzt tzt_reference_test_suite/macro_pack/cmpeq_00.tzt tzt_reference_test_suite/macro_pack/cmpge_00.tzt tzt_reference_test_suite/macro_pack/cmpgt_00.tzt tzt_reference_test_suite/macro_pack/cmple_00.tzt tzt_reference_test_suite/macro_pack/cmplt_00.tzt tzt_reference_test_suite/macro_pack/cmpneq_00.tzt tzt_reference_test_suite/macro_pack/fail_00.tzt tzt_reference_test_suite/macro_pack/ifcmpeq_00.tzt tzt_reference_test_suite/macro_pack/ifcmpge_00.tzt tzt_reference_test_suite/macro_pack/ifcmpgt_00.tzt tzt_reference_test_suite/macro_pack/ifcmple_00.tzt tzt_reference_test_suite/macro_pack/ifcmplt_00.tzt tzt_reference_test_suite/macro_pack/ifcmpneq_00.tzt tzt_reference_test_suite/macro_pack/ifeq_00.tzt tzt_reference_test_suite/macro_pack/ifge_00.tzt tzt_reference_test_suite/macro_pack/ifgt_00.tzt tzt_reference_test_suite/macro_pack/ifle_00.tzt tzt_reference_test_suite/macro_pack/iflt_00.tzt tzt_reference_test_suite/macro_pack/ifneq_00.tzt tzt_reference_test_suite/macro_pack/ifright_00.tzt tzt_reference_test_suite/macro_pack/ifsome_00.tzt tzt_reference_test_suite/macro_pack/mapcadr_00.tzt tzt_reference_test_suite/macro_pack/mapcar_00.tzt tzt_reference_test_suite/macro_pack/mapcdr_00.tzt tzt_reference_test_suite/macro_pack/papair_00.tzt tzt_reference_test_suite/macro_pack/setcadr_00.tzt tzt_reference_test_suite/macro_pack/setcar_00.tzt tzt_reference_test_suite/macro_pack/setcdr_00.tzt tzt_reference_test_suite/macro_pack/unpapair_00.tzt tzt_reference_test_suite/map_listint_00.tzt tzt_reference_test_suite/map_listint_01.tzt tzt_reference_test_suite/map_listint_02.tzt tzt_reference_test_suite/map_listint_03.tzt tzt_reference_test_suite/map_listint_04.tzt tzt_reference_test_suite/map_listint_05.tzt tzt_reference_test_suite/map_listint_06.tzt tzt_reference_test_suite/map_liststring_00.tzt tzt_reference_test_suite/map_liststring_01.tzt tzt_reference_test_suite/map_liststring_02.tzt tzt_reference_test_suite/map_liststring_04.tzt tzt_reference_test_suite/map_liststring_05.tzt tzt_reference_test_suite/map_liststring_06.tzt tzt_reference_test_suite/map_liststring_07.tzt tzt_reference_test_suite/map_liststring_08.tzt tzt_reference_test_suite/map_mapintint_00.tzt tzt_reference_test_suite/map_mapintint_01.tzt tzt_reference_test_suite/map_mapintstring_00.tzt tzt_reference_test_suite/map_mapintstring_01.tzt tzt_reference_test_suite/map_mapstringnat_00.tzt tzt_reference_test_suite/map_mapstringnat_01.tzt tzt_reference_test_suite/map_mapstringnat_02.tzt tzt_reference_test_suite/mem_bigmapnatnat_00.tzt tzt_reference_test_suite/mem_bigmapnatnat_01.tzt tzt_reference_test_suite/mem_bigmapnatnat_02.tzt tzt_reference_test_suite/mem_bigmapnatnat_03.tzt tzt_reference_test_suite/mem_bigmapnatnat_04.tzt tzt_reference_test_suite/mem_bigmapnatnat_05.tzt tzt_reference_test_suite/mem_bigmapstringnat_00.tzt tzt_reference_test_suite/mem_bigmapstringnat_01.tzt tzt_reference_test_suite/mem_bigmapstringnat_02.tzt tzt_reference_test_suite/mem_bigmapstringnat_03.tzt tzt_reference_test_suite/mem_bigmapstringnat_04.tzt tzt_reference_test_suite/mem_bigmapstringnat_05.tzt tzt_reference_test_suite/mem_mapintint_00.tzt tzt_reference_test_suite/mem_mapnatnat_00.tzt tzt_reference_test_suite/mem_mapnatnat_01.tzt tzt_reference_test_suite/mem_mapnatnat_02.tzt tzt_reference_test_suite/mem_mapnatnat_03.tzt tzt_reference_test_suite/mem_mapnatnat_04.tzt tzt_reference_test_suite/mem_mapnatnat_05.tzt tzt_reference_test_suite/mem_mapstringnat_00.tzt tzt_reference_test_suite/mem_mapstringnat_01.tzt tzt_reference_test_suite/mem_mapstringnat_02.tzt tzt_reference_test_suite/mem_mapstringnat_03.tzt tzt_reference_test_suite/mem_mapstringnat_04.tzt tzt_reference_test_suite/mem_mapstringnat_05.tzt tzt_reference_test_suite/mem_setint_00.tzt tzt_reference_test_suite/mem_setint_01.tzt tzt_reference_test_suite/mem_setstring_00.tzt tzt_reference_test_suite/mem_setstring_01.tzt tzt_reference_test_suite/mem_setstring_02.tzt tzt_reference_test_suite/mul_int-int_00.tzt tzt_reference_test_suite/mul_int-nat_00.tzt tzt_reference_test_suite/mul_mutez-nat_00.tzt tzt_reference_test_suite/mul_mutez-nat_01.tzt tzt_reference_test_suite/mul_nat-int_00.tzt tzt_reference_test_suite/mul_nat-mutez_00.tzt tzt_reference_test_suite/mul_nat-mutez_01.tzt tzt_reference_test_suite/mul_nat-nat_00.tzt tzt_reference_test_suite/neg_int_00.tzt tzt_reference_test_suite/neg_int_01.tzt tzt_reference_test_suite/neg_int_02.tzt tzt_reference_test_suite/neg_nat_00.tzt tzt_reference_test_suite/neg_nat_01.tzt tzt_reference_test_suite/neq_00.tzt tzt_reference_test_suite/neq_01.tzt tzt_reference_test_suite/neq_02.tzt tzt_reference_test_suite/neq_03.tzt tzt_reference_test_suite/neq_04.tzt tzt_reference_test_suite/never_00.tzt tzt_reference_test_suite/never_00.tc.tzt tzt_reference_test_suite/nil_nat_00.tzt tzt_reference_test_suite/none_int_00.tzt tzt_reference_test_suite/none_pair-nat-string.tzt tzt_reference_test_suite/not_bool_00.tzt tzt_reference_test_suite/not_bool_01.tzt tzt_reference_test_suite/not_bytes_00.tzt tzt_reference_test_suite/not_bytes_01.tzt tzt_reference_test_suite/not_bytes_02.tzt tzt_reference_test_suite/not_bytes_03.tzt tzt_reference_test_suite/not_bytes_04.tzt tzt_reference_test_suite/not_bytes_05.tzt tzt_reference_test_suite/not_int_00.tzt tzt_reference_test_suite/not_nat_00.tzt tzt_reference_test_suite/not_nat_01.tzt tzt_reference_test_suite/not_nat_02.tzt tzt_reference_test_suite/not_nat_03.tzt tzt_reference_test_suite/not_nat_04.tzt tzt_reference_test_suite/not_nat_05.tzt tzt_reference_test_suite/not_nat_06.tzt tzt_reference_test_suite/not_nat_07.tzt tzt_reference_test_suite/now_00.tzt tzt_reference_test_suite/or_bool-bool_00.tzt tzt_reference_test_suite/or_bool-bool_01.tzt tzt_reference_test_suite/or_bool-bool_02.tzt tzt_reference_test_suite/or_bool-bool_03.tzt tzt_reference_test_suite/or_bytes-bytes_00.tzt tzt_reference_test_suite/or_bytes-bytes_01.tzt tzt_reference_test_suite/or_bytes-bytes_02.tzt tzt_reference_test_suite/or_bytes-bytes_03.tzt tzt_reference_test_suite/or_bytes-bytes_04.tzt tzt_reference_test_suite/or_bytes-bytes_05.tzt tzt_reference_test_suite/or_bytes-bytes_06.tzt tzt_reference_test_suite/or_nat-nat_00.tzt tzt_reference_test_suite/or_nat-nat_01.tzt tzt_reference_test_suite/or_nat-nat_02.tzt tzt_reference_test_suite/or_nat-nat_03.tzt tzt_reference_test_suite/or_nat-nat_04.tzt tzt_reference_test_suite/or_nat-nat_05.tzt tzt_reference_test_suite/or_nat-nat_06.tzt tzt_reference_test_suite/pack_address_00.tzt tzt_reference_test_suite/pack_address_01.tzt tzt_reference_test_suite/pack_address_02.tzt tzt_reference_test_suite/pack_address_03.tzt tzt_reference_test_suite/pack_address_04.tzt tzt_reference_test_suite/pack_address_05.tzt tzt_reference_test_suite/pack_bool_00.tzt tzt_reference_test_suite/pack_bool_01.tzt tzt_reference_test_suite/pack_bytes_00.tzt tzt_reference_test_suite/pack_bytes_01.tzt tzt_reference_test_suite/pack_bytes_02.tzt tzt_reference_test_suite/pack_chainid_00.tzt tzt_reference_test_suite/pack_contract_00.tzt tzt_reference_test_suite/pack_key_00.tzt tzt_reference_test_suite/pack_key_01.tzt tzt_reference_test_suite/pack_key_02.tzt tzt_reference_test_suite/pack_key_03.tzt tzt_reference_test_suite/pack_keyhash_01.tzt tzt_reference_test_suite/pack_keyhash_02.tzt tzt_reference_test_suite/pack_keyhash_03.tzt tzt_reference_test_suite/pack_keyhash_04.tzt tzt_reference_test_suite/pack_lambda_comb_pairs.tzt tzt_reference_test_suite/pack_list-bool_00.tzt tzt_reference_test_suite/pack_list-bool_01.tzt tzt_reference_test_suite/pack_list-list-bool.tzt tzt_reference_test_suite/pack_list_large_00.tzt tzt_reference_test_suite/pack_map-bool-unit_00.tzt tzt_reference_test_suite/pack_operation_00.tc.tzt tzt_reference_test_suite/pack_option-unit_00.tzt tzt_reference_test_suite/pack_option-unit_01.tzt tzt_reference_test_suite/pack_or-unit-bool_00.tzt tzt_reference_test_suite/pack_or-unit-bool_01.tzt tzt_reference_test_suite/pack_pair-bool-unit_00.tzt tzt_reference_test_suite/pack_signature_00.tzt tzt_reference_test_suite/pack_signature_01.tzt tzt_reference_test_suite/pack_signature_02.tzt tzt_reference_test_suite/pack_signature_03.tzt tzt_reference_test_suite/pack_string_00.tzt tzt_reference_test_suite/pack_string_01.tzt tzt_reference_test_suite/pack_string_02.tzt tzt_reference_test_suite/pack_string_03.tzt tzt_reference_test_suite/pack_unit_00.tzt tzt_reference_test_suite/packunpack_address_00.tzt tzt_reference_test_suite/packunpack_bool_00.tzt tzt_reference_test_suite/packunpack_bytes_00.tzt tzt_reference_test_suite/packunpack_int_00.tzt tzt_reference_test_suite/packunpack_keyhash_00.tzt tzt_reference_test_suite/packunpack_mutez_00.tzt tzt_reference_test_suite/packunpack_nat_00.tzt tzt_reference_test_suite/packunpack_string_00.tzt tzt_reference_test_suite/packunpack_timestamp_00.tzt tzt_reference_test_suite/pair_00.tc.tzt tzt_reference_test_suite/pair_int-int_00.tzt tzt_reference_test_suite/pair_nat-string_00.tzt tzt_reference_test_suite/pair_pair-nat-string-pair-string-nat_00.tzt tzt_reference_test_suite/push_00.tc.tzt tzt_reference_test_suite/push_int_00.tzt tzt_reference_test_suite/push_string_00.tzt tzt_reference_test_suite/read_ticket_00.tzt tzt_reference_test_suite/right_nat-int_00.tzt tzt_reference_test_suite/self_00.tzt tzt_reference_test_suite/self_01.tzt tzt_reference_test_suite/self_in_lambda.tc.tzt tzt_reference_test_suite/sender_00.tzt tzt_reference_test_suite/setdelegate_00.tzt tzt_reference_test_suite/setdelegate_00.tc.tzt tzt_reference_test_suite/sha256_00.tzt tzt_reference_test_suite/sha256_01.tzt tzt_reference_test_suite/sha3_00.tzt tzt_reference_test_suite/sha3_01.tzt tzt_reference_test_suite/sha512_00.tzt tzt_reference_test_suite/sha512_01.tzt tzt_reference_test_suite/size_bytes_00.tzt tzt_reference_test_suite/size_listint_00.tzt tzt_reference_test_suite/size_listint_01.tzt tzt_reference_test_suite/size_listint_02.tzt tzt_reference_test_suite/size_listint_03.tzt tzt_reference_test_suite/size_mapintint_00.tzt tzt_reference_test_suite/size_mapstringnat_00.tzt tzt_reference_test_suite/size_mapstringnat_01.tzt tzt_reference_test_suite/size_mapstringnat_02.tzt tzt_reference_test_suite/size_mapstringnat_03.tzt tzt_reference_test_suite/size_setint_00.tzt tzt_reference_test_suite/size_setint_01.tzt tzt_reference_test_suite/size_setint_02.tzt tzt_reference_test_suite/size_setint_03.tzt tzt_reference_test_suite/size_setstring_00.tzt tzt_reference_test_suite/size_string_00.tzt tzt_reference_test_suite/slice_bytes_00.tzt tzt_reference_test_suite/slice_bytes_01.tzt tzt_reference_test_suite/slice_bytes_02.tzt tzt_reference_test_suite/slice_bytes_03.tzt tzt_reference_test_suite/slice_bytes_04.tzt tzt_reference_test_suite/slice_string_00.tzt tzt_reference_test_suite/slice_string_01.tzt tzt_reference_test_suite/slice_string_02.tzt tzt_reference_test_suite/slice_string_03.tzt tzt_reference_test_suite/slice_string_04.tzt tzt_reference_test_suite/slice_string_05.tzt tzt_reference_test_suite/some_00.tc.tzt tzt_reference_test_suite/some_int_00.tzt tzt_reference_test_suite/some_pairintint_00.tzt tzt_reference_test_suite/some_string_00.tzt tzt_reference_test_suite/source_00.tzt tzt_reference_test_suite/split_ticket_00.tzt tzt_reference_test_suite/split_ticket_01.tzt tzt_reference_test_suite/split_ticket_02.tzt tzt_reference_test_suite/split_ticket_03.tzt tzt_reference_test_suite/split_ticket_04.tzt tzt_reference_test_suite/sub_int-int_00.tzt tzt_reference_test_suite/sub_int-int_01.tzt tzt_reference_test_suite/sub_mutez-mutez_00.tzt tzt_reference_test_suite/sub_mutez-mutez_01.tzt tzt_reference_test_suite/sub_timestamp-int_00.tzt tzt_reference_test_suite/sub_timestamp-int_01.tzt tzt_reference_test_suite/sub_timestamp-int_02.tzt tzt_reference_test_suite/sub_timestamp-int_03.tzt tzt_reference_test_suite/sub_timestamp-int_04.tzt tzt_reference_test_suite/sub_timestamp-timestamp_00.tzt tzt_reference_test_suite/sub_timestamp-timestamp_01.tzt tzt_reference_test_suite/sub_timestamp-timestamp_02.tzt tzt_reference_test_suite/sub_timestamp-timestamp_03.tzt tzt_reference_test_suite/swap_00.tzt tzt_reference_test_suite/swap_00.tc.tzt tzt_reference_test_suite/swap_01.tc.tzt tzt_reference_test_suite/ticket_00.tzt tzt_reference_test_suite/ticket_01.tzt tzt_reference_test_suite/transfertokens_00.tzt tzt_reference_test_suite/transfertokens_00.tc.tzt tzt_reference_test_suite/transfertokens_01.tzt tzt_reference_test_suite/unit_00.tzt tzt_reference_test_suite/unpair_00.tc.tzt tzt_reference_test_suite/unpair_pairstringstring_00.tzt tzt_reference_test_suite/update_00.tc.tzt tzt_reference_test_suite/update_bigmapstringstring_00.tzt tzt_reference_test_suite/update_bigmapstringstring_01.tzt tzt_reference_test_suite/update_bigmapstringstring_02.tzt tzt_reference_test_suite/update_bigmapstringstring_03.tzt tzt_reference_test_suite/update_bigmapstringstring_04.tzt tzt_reference_test_suite/update_bigmapstringstring_05.tzt tzt_reference_test_suite/update_bigmapstringstring_06.tzt tzt_reference_test_suite/update_bigmapstringstring_07.tzt tzt_reference_test_suite/update_mapintint_00.tzt tzt_reference_test_suite/update_mapintint_01.tzt tzt_reference_test_suite/update_setint_00.tzt tzt_reference_test_suite/update_setint_01.tzt tzt_reference_test_suite/update_setint_02.tzt tzt_reference_test_suite/xor_bool-bool_00.tzt tzt_reference_test_suite/xor_bool-bool_01.tzt tzt_reference_test_suite/xor_bool-bool_02.tzt tzt_reference_test_suite/xor_bool-bool_03.tzt tzt_reference_test_suite/xor_bytes-bytes_00.tzt tzt_reference_test_suite/xor_bytes-bytes_01.tzt tzt_reference_test_suite/xor_bytes-bytes_02.tzt tzt_reference_test_suite/xor_bytes-bytes_03.tzt tzt_reference_test_suite/xor_bytes-bytes_04.tzt tzt_reference_test_suite/xor_bytes-bytes_05.tzt tzt_reference_test_suite/xor_bytes-bytes_06.tzt tzt_reference_test_suite/xor_nat-nat_00.tzt tzt_reference_test_suite/xor_nat-nat_01.tzt tzt_reference_test_suite/xor_nat-nat_02.tzt tzt_reference_test_suite/xor_nat-nat_03.tzt tzt_reference_test_suite/xor_nat-nat_04.tzt tzt_reference_test_suite/xor_nat-nat_05.tzt tzt_reference_test_suite/xor_nat-nat_06.tzt
+./octez-client --protocol PtParisAaGGWiaegwuZTJ7ETnQKoqoHWJ3p6wNp7TcbAb7gLbMc --mode mockup --no-base-dir-warnings run unit tests from tzt_reference_test_suite/abs_00.tzt tzt_reference_test_suite/abs_01.tzt tzt_reference_test_suite/abs_02.tzt tzt_reference_test_suite/add_00.tc.tzt tzt_reference_test_suite/add_01.tc.tzt tzt_reference_test_suite/add_int-int_00.tzt tzt_reference_test_suite/add_int-nat_00.tzt tzt_reference_test_suite/add_int-nat_01.tzt tzt_reference_test_suite/add_int-timestamp_00.tzt tzt_reference_test_suite/add_mutez-mutez_00.tzt tzt_reference_test_suite/add_mutez-mutez_01.tzt tzt_reference_test_suite/add_nat-int_00.tzt tzt_reference_test_suite/add_nat-nat_00.tzt tzt_reference_test_suite/add_timestamp-int_00.tzt tzt_reference_test_suite/add_timestamp-int_01.tzt tzt_reference_test_suite/add_timestamp-int_02.tzt tzt_reference_test_suite/add_timestamp-int_03.tzt tzt_reference_test_suite/address_00.tzt tzt_reference_test_suite/address_00.tc.tzt tzt_reference_test_suite/address_01.tzt tzt_reference_test_suite/address_02.tzt tzt_reference_test_suite/amount_00.tzt tzt_reference_test_suite/and_bool-bool_00.tzt tzt_reference_test_suite/and_bool-bool_01.tzt tzt_reference_test_suite/and_bool-bool_02.tzt tzt_reference_test_suite/and_bool-bool_03.tzt tzt_reference_test_suite/and_bytes-bytes_00.tzt tzt_reference_test_suite/and_bytes-bytes_01.tzt tzt_reference_test_suite/and_bytes-bytes_02.tzt tzt_reference_test_suite/and_bytes-bytes_03.tzt tzt_reference_test_suite/and_bytes-bytes_04.tzt tzt_reference_test_suite/and_bytes-bytes_05.tzt tzt_reference_test_suite/and_bytes-bytes_06.tzt tzt_reference_test_suite/and_int-nat_00.tzt tzt_reference_test_suite/and_int-nat_01.tzt tzt_reference_test_suite/and_int-nat_02.tzt tzt_reference_test_suite/and_int-nat_03.tzt tzt_reference_test_suite/and_int-nat_04.tzt tzt_reference_test_suite/and_int-nat_05.tzt tzt_reference_test_suite/and_int-nat_06.tzt tzt_reference_test_suite/and_nat-nat_00.tzt tzt_reference_test_suite/and_nat-nat_01.tzt tzt_reference_test_suite/and_nat-nat_02.tzt tzt_reference_test_suite/apply_00.tzt tzt_reference_test_suite/apply_01.tzt tzt_reference_test_suite/apply_02.tzt tzt_reference_test_suite/balance_00.tzt tzt_reference_test_suite/blake2b_00.tzt tzt_reference_test_suite/blake2b_01.tzt tzt_reference_test_suite/car_00.tzt tzt_reference_test_suite/car_00.tc.tzt tzt_reference_test_suite/car_01.tzt tzt_reference_test_suite/cdr_00.tzt tzt_reference_test_suite/cdr_00.tc.tzt tzt_reference_test_suite/cdr_01.tzt tzt_reference_test_suite/chain_id_00.tzt tzt_reference_test_suite/chain_id_01.tzt tzt_reference_test_suite/checksignature_00.tzt tzt_reference_test_suite/checksignature_00.tc.tzt tzt_reference_test_suite/checksignature_01.tzt tzt_reference_test_suite/compare_00.tc.tzt tzt_reference_test_suite/compare_01.tc.tzt tzt_reference_test_suite/compare_02.tc.tzt tzt_reference_test_suite/compare_bool_00.tzt tzt_reference_test_suite/compare_bool_01.tzt tzt_reference_test_suite/compare_bool_02.tzt tzt_reference_test_suite/compare_bool_03.tzt tzt_reference_test_suite/compare_bytes_00.tzt tzt_reference_test_suite/compare_bytes_01.tzt tzt_reference_test_suite/compare_bytes_02.tzt tzt_reference_test_suite/compare_bytes_03.tzt tzt_reference_test_suite/compare_bytes_04.tzt tzt_reference_test_suite/compare_int_00.tzt tzt_reference_test_suite/compare_int_01.tzt tzt_reference_test_suite/compare_int_02.tzt tzt_reference_test_suite/compare_int_03.tzt tzt_reference_test_suite/compare_int_04.tzt tzt_reference_test_suite/compare_keyhash_00.tzt tzt_reference_test_suite/compare_keyhash_01.tzt tzt_reference_test_suite/compare_keyhash_02.tzt tzt_reference_test_suite/compare_mutez_00.tzt tzt_reference_test_suite/compare_mutez_01.tzt tzt_reference_test_suite/compare_mutez_02.tzt tzt_reference_test_suite/compare_mutez_03.tzt tzt_reference_test_suite/compare_mutez_04.tzt tzt_reference_test_suite/compare_mutez_05.tzt tzt_reference_test_suite/compare_nat_00.tzt tzt_reference_test_suite/compare_nat_01.tzt tzt_reference_test_suite/compare_nat_02.tzt tzt_reference_test_suite/compare_nat_03.tzt tzt_reference_test_suite/compare_nat_04.tzt tzt_reference_test_suite/compare_nat_05.tzt tzt_reference_test_suite/compare_never_00.tzt tzt_reference_test_suite/compare_pairintint_00.tzt tzt_reference_test_suite/compare_pairintint_01.tzt tzt_reference_test_suite/compare_pairintint_02.tzt tzt_reference_test_suite/compare_pairintint_03.tzt tzt_reference_test_suite/compare_string_00.tzt tzt_reference_test_suite/compare_string_01.tzt tzt_reference_test_suite/compare_string_02.tzt tzt_reference_test_suite/compare_string_03.tzt tzt_reference_test_suite/compare_string_04.tzt tzt_reference_test_suite/compare_timestamp_00.tzt tzt_reference_test_suite/compare_timestamp_01.tzt tzt_reference_test_suite/compare_timestamp_02.tzt tzt_reference_test_suite/compare_timestamp_03.tzt tzt_reference_test_suite/compare_timestamp_04.tzt tzt_reference_test_suite/compare_timestamp_05.tzt tzt_reference_test_suite/concat_00.tc.tzt tzt_reference_test_suite/concat_bytes_00.tzt tzt_reference_test_suite/concat_bytes_01.tzt tzt_reference_test_suite/concat_listbytes_00.tzt tzt_reference_test_suite/concat_listbytes_01.tzt tzt_reference_test_suite/concat_listbytes_02.tzt tzt_reference_test_suite/concat_liststring_00.tzt tzt_reference_test_suite/concat_liststring_01.tzt tzt_reference_test_suite/concat_liststring_02.tzt tzt_reference_test_suite/concat_liststring_03.tzt tzt_reference_test_suite/concat_liststring_04.tzt tzt_reference_test_suite/concat_string_00.tzt tzt_reference_test_suite/concat_string_01.tzt tzt_reference_test_suite/concat_string_02.tzt tzt_reference_test_suite/cons_int_00.tzt tzt_reference_test_suite/cons_int_01.tzt tzt_reference_test_suite/cons_int_02.tzt tzt_reference_test_suite/cons_lists_00.tc.tzt tzt_reference_test_suite/cons_string_00.tzt tzt_reference_test_suite/contract_00.tzt tzt_reference_test_suite/contract_01.tzt tzt_reference_test_suite/contract_02.tzt tzt_reference_test_suite/contract_03.tzt tzt_reference_test_suite/contract_04.tzt tzt_reference_test_suite/contract_05.tzt tzt_reference_test_suite/createcontract_00.tzt tzt_reference_test_suite/createcontract_01.tzt tzt_reference_test_suite/dig_00.tzt tzt_reference_test_suite/dig_01.tzt tzt_reference_test_suite/dig_02.tzt tzt_reference_test_suite/dig_03.tzt tzt_reference_test_suite/dig_04.tzt tzt_reference_test_suite/dip_00.tzt tzt_reference_test_suite/dip_00.tc.tzt tzt_reference_test_suite/dip_01.tzt tzt_reference_test_suite/dip_02.tzt tzt_reference_test_suite/dipn_00.tzt tzt_reference_test_suite/dipn_00.tc.tzt tzt_reference_test_suite/dipn_01.tzt tzt_reference_test_suite/dipn_01.tc.tzt tzt_reference_test_suite/dipn_02.tzt tzt_reference_test_suite/dipn_02.tc.tzt tzt_reference_test_suite/dipn_03.tzt tzt_reference_test_suite/drop_00.tzt tzt_reference_test_suite/drop_00.tc.tzt tzt_reference_test_suite/dropn_00.tzt tzt_reference_test_suite/dropn_00.tc.tzt tzt_reference_test_suite/dropn_01.tzt tzt_reference_test_suite/dropn_02.tzt tzt_reference_test_suite/dropn_03.tzt tzt_reference_test_suite/dugn_00.tzt tzt_reference_test_suite/dup_00.tzt tzt_reference_test_suite/dup_00.tc.tzt tzt_reference_test_suite/dupn_00.tzt tzt_reference_test_suite/dupn_00.tc.tzt tzt_reference_test_suite/dupn_01.tzt tzt_reference_test_suite/dupn_01.tc.tzt tzt_reference_test_suite/dupn_02.tzt tzt_reference_test_suite/dupn_03.tzt tzt_reference_test_suite/dupn_04.tzt tzt_reference_test_suite/ediv_int-int_00.tzt tzt_reference_test_suite/ediv_int-int_01.tzt tzt_reference_test_suite/ediv_int-int_02.tzt tzt_reference_test_suite/ediv_int-int_03.tzt tzt_reference_test_suite/ediv_mutez-mutez_00.tzt tzt_reference_test_suite/ediv_mutez-mutez_01.tzt tzt_reference_test_suite/ediv_mutez-mutez_02.tzt tzt_reference_test_suite/ediv_mutez-mutez_03.tzt tzt_reference_test_suite/ediv_mutez-nat_00.tzt tzt_reference_test_suite/ediv_mutez-nat_01.tzt tzt_reference_test_suite/ediv_mutez-nat_02.tzt tzt_reference_test_suite/ediv_mutez-nat_03.tzt tzt_reference_test_suite/ediv_mutez-nat_04.tzt tzt_reference_test_suite/ediv_mutez-nat_05.tzt tzt_reference_test_suite/ediv_mutez-nat_06.tzt tzt_reference_test_suite/emptybigmap_nat-nat_00.tzt tzt_reference_test_suite/emptymap_nat-nat_00.tzt tzt_reference_test_suite/emptymap_string-string_00.tzt tzt_reference_test_suite/emptyset_00.tc.tzt tzt_reference_test_suite/emptyset_nat_00.tzt tzt_reference_test_suite/eq_00.tzt tzt_reference_test_suite/eq_01.tzt tzt_reference_test_suite/eq_02.tzt tzt_reference_test_suite/eq_03.tzt tzt_reference_test_suite/eq_04.tzt tzt_reference_test_suite/exec_00.tzt tzt_reference_test_suite/exec_01.tzt tzt_reference_test_suite/exec_02.tzt tzt_reference_test_suite/exec_03.tzt tzt_reference_test_suite/failwith_00.tzt tzt_reference_test_suite/failwith_00.tc.tzt tzt_reference_test_suite/gas_exhaustion.tzt tzt_reference_test_suite/ge_00.tzt tzt_reference_test_suite/ge_01.tzt tzt_reference_test_suite/ge_02.tzt tzt_reference_test_suite/ge_03.tzt tzt_reference_test_suite/ge_04.tzt tzt_reference_test_suite/get_00.tc.tzt tzt_reference_test_suite/get_bigmapstringstring_00.tzt tzt_reference_test_suite/get_bigmapstringstring_01.tzt tzt_reference_test_suite/get_bigmapstringstring_02.tzt tzt_reference_test_suite/get_map_00.tc.tzt tzt_reference_test_suite/get_mapintint_00.tzt tzt_reference_test_suite/get_mapintint_01.tzt tzt_reference_test_suite/get_mapstringstring_00.tzt tzt_reference_test_suite/get_mapstringstring_01.tzt tzt_reference_test_suite/get_mapstringstring_02.tzt tzt_reference_test_suite/gt_00.tzt tzt_reference_test_suite/gt_00.tc.tzt tzt_reference_test_suite/gt_01.tzt tzt_reference_test_suite/gt_02.tzt tzt_reference_test_suite/gt_03.tzt tzt_reference_test_suite/gt_04.tzt tzt_reference_test_suite/if_00.tzt tzt_reference_test_suite/if_00.tc.tzt tzt_reference_test_suite/if_01.tzt tzt_reference_test_suite/if_01.tc.tzt tzt_reference_test_suite/ifcons_00.tc.tzt tzt_reference_test_suite/ifcons_listint_00.tzt tzt_reference_test_suite/ifcons_listint_01.tzt tzt_reference_test_suite/ifcons_listnat_00.tzt tzt_reference_test_suite/ifcons_listnat_01.tzt tzt_reference_test_suite/ifleft_00.tc.tzt tzt_reference_test_suite/ifleft_orintstring_00.tzt tzt_reference_test_suite/ifleft_orstringint_00.tzt tzt_reference_test_suite/ifnone_00.tc.tzt tzt_reference_test_suite/ifnone_optionint_00.tzt tzt_reference_test_suite/ifnone_optionnat_00.tzt tzt_reference_test_suite/implicitaccount_00.tzt tzt_reference_test_suite/int_00.tc.tzt tzt_reference_test_suite/int_nat_00.tzt tzt_reference_test_suite/int_nat_01.tzt tzt_reference_test_suite/isnat_00.tzt tzt_reference_test_suite/isnat_01.tzt tzt_reference_test_suite/iter_00.tc.tzt tzt_reference_test_suite/iter_listint_00.tzt tzt_reference_test_suite/iter_listint_01.tzt tzt_reference_test_suite/iter_listint_02.tzt tzt_reference_test_suite/iter_listint_03.tzt tzt_reference_test_suite/iter_liststring_00.tzt tzt_reference_test_suite/iter_liststring_01.tzt tzt_reference_test_suite/iter_mapintint_00.tzt tzt_reference_test_suite/iter_mapintint_01.tzt tzt_reference_test_suite/iter_mapintint_02.tzt tzt_reference_test_suite/iter_mapintint_03.tzt tzt_reference_test_suite/iter_mapintint_04.tzt tzt_reference_test_suite/iter_mapstringstring_00.tzt tzt_reference_test_suite/iter_setint_00.tzt tzt_reference_test_suite/iter_setint_01.tzt tzt_reference_test_suite/iter_setint_02.tzt tzt_reference_test_suite/iter_setstring_00.tzt tzt_reference_test_suite/iter_setstring_01.tzt tzt_reference_test_suite/iter_setstring_02.tzt tzt_reference_test_suite/join_tickets_00.tzt tzt_reference_test_suite/join_tickets_01.tzt tzt_reference_test_suite/join_tickets_02.tzt tzt_reference_test_suite/join_tickets_03.tzt tzt_reference_test_suite/keccak_00.tzt tzt_reference_test_suite/keccak_01.tzt tzt_reference_test_suite/le_00.tzt tzt_reference_test_suite/le_01.tzt tzt_reference_test_suite/le_02.tzt tzt_reference_test_suite/le_03.tzt tzt_reference_test_suite/le_04.tzt tzt_reference_test_suite/left_int-nat_00.tzt tzt_reference_test_suite/loop_00.tzt tzt_reference_test_suite/loop_00.tc.tzt tzt_reference_test_suite/loop_01.tzt tzt_reference_test_suite/loop_01.tc.tzt tzt_reference_test_suite/loop_02.tzt tzt_reference_test_suite/loopleft_00.tzt tzt_reference_test_suite/loopleft_01.tzt tzt_reference_test_suite/loopleft_02.tzt tzt_reference_test_suite/loopleft_03.tzt tzt_reference_test_suite/loopleft_04.tzt tzt_reference_test_suite/lsl_00.tzt tzt_reference_test_suite/lsl_01.tzt tzt_reference_test_suite/lsl_02.tzt tzt_reference_test_suite/lsl_03.tzt tzt_reference_test_suite/lsl_04.tzt tzt_reference_test_suite/lsl_05.tzt tzt_reference_test_suite/lsl_06.tzt tzt_reference_test_suite/lsr_00.tzt tzt_reference_test_suite/lsr_01.tzt tzt_reference_test_suite/lsr_02.tzt tzt_reference_test_suite/lsr_03.tzt tzt_reference_test_suite/lsr_04.tzt tzt_reference_test_suite/lsr_05.tzt tzt_reference_test_suite/lt_00.tzt tzt_reference_test_suite/lt_01.tzt tzt_reference_test_suite/lt_02.tzt tzt_reference_test_suite/lt_03.tzt tzt_reference_test_suite/lt_04.tzt tzt_reference_test_suite/macro_pack/assert_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpeq_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpge_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpgt_00.tzt tzt_reference_test_suite/macro_pack/assert_cmple_00.tzt tzt_reference_test_suite/macro_pack/assert_cmplt_00.tzt tzt_reference_test_suite/macro_pack/assert_cmpneq_00.tzt tzt_reference_test_suite/macro_pack/assert_eq_00.tzt tzt_reference_test_suite/macro_pack/assert_ge_00.tzt tzt_reference_test_suite/macro_pack/assert_gt_00.tzt tzt_reference_test_suite/macro_pack/assert_le_00.tzt tzt_reference_test_suite/macro_pack/assert_left_00.tzt tzt_reference_test_suite/macro_pack/assert_lt_00.tzt tzt_reference_test_suite/macro_pack/assert_neq_00.tzt tzt_reference_test_suite/macro_pack/assert_none_00.tzt tzt_reference_test_suite/macro_pack/assert_right_00.tzt tzt_reference_test_suite/macro_pack/assert_some_00.tzt tzt_reference_test_suite/macro_pack/cadr_00.tzt tzt_reference_test_suite/macro_pack/carn_00.tzt tzt_reference_test_suite/macro_pack/carn_01.tzt tzt_reference_test_suite/macro_pack/cdrn_00.tzt tzt_reference_test_suite/macro_pack/cdrn_01.tzt tzt_reference_test_suite/macro_pack/cmpeq_00.tzt tzt_reference_test_suite/macro_pack/cmpge_00.tzt tzt_reference_test_suite/macro_pack/cmpgt_00.tzt tzt_reference_test_suite/macro_pack/cmple_00.tzt tzt_reference_test_suite/macro_pack/cmplt_00.tzt tzt_reference_test_suite/macro_pack/cmpneq_00.tzt tzt_reference_test_suite/macro_pack/fail_00.tzt tzt_reference_test_suite/macro_pack/ifcmpeq_00.tzt tzt_reference_test_suite/macro_pack/ifcmpge_00.tzt tzt_reference_test_suite/macro_pack/ifcmpgt_00.tzt tzt_reference_test_suite/macro_pack/ifcmple_00.tzt tzt_reference_test_suite/macro_pack/ifcmplt_00.tzt tzt_reference_test_suite/macro_pack/ifcmpneq_00.tzt tzt_reference_test_suite/macro_pack/ifeq_00.tzt tzt_reference_test_suite/macro_pack/ifge_00.tzt tzt_reference_test_suite/macro_pack/ifgt_00.tzt tzt_reference_test_suite/macro_pack/ifle_00.tzt tzt_reference_test_suite/macro_pack/iflt_00.tzt tzt_reference_test_suite/macro_pack/ifneq_00.tzt tzt_reference_test_suite/macro_pack/ifright_00.tzt tzt_reference_test_suite/macro_pack/ifsome_00.tzt tzt_reference_test_suite/macro_pack/mapcadr_00.tzt tzt_reference_test_suite/macro_pack/mapcar_00.tzt tzt_reference_test_suite/macro_pack/mapcdr_00.tzt tzt_reference_test_suite/macro_pack/papair_00.tzt tzt_reference_test_suite/macro_pack/setcadr_00.tzt tzt_reference_test_suite/macro_pack/setcar_00.tzt tzt_reference_test_suite/macro_pack/setcdr_00.tzt tzt_reference_test_suite/macro_pack/unpapair_00.tzt tzt_reference_test_suite/map_listint_00.tzt tzt_reference_test_suite/map_listint_01.tzt tzt_reference_test_suite/map_listint_02.tzt tzt_reference_test_suite/map_listint_03.tzt tzt_reference_test_suite/map_listint_04.tzt tzt_reference_test_suite/map_listint_05.tzt tzt_reference_test_suite/map_listint_06.tzt tzt_reference_test_suite/map_liststring_00.tzt tzt_reference_test_suite/map_liststring_01.tzt tzt_reference_test_suite/map_liststring_02.tzt tzt_reference_test_suite/map_liststring_04.tzt tzt_reference_test_suite/map_liststring_05.tzt tzt_reference_test_suite/map_liststring_06.tzt tzt_reference_test_suite/map_liststring_07.tzt tzt_reference_test_suite/map_liststring_08.tzt tzt_reference_test_suite/map_mapintint_00.tzt tzt_reference_test_suite/map_mapintint_01.tzt tzt_reference_test_suite/map_mapintstring_00.tzt tzt_reference_test_suite/map_mapintstring_01.tzt tzt_reference_test_suite/map_mapstringnat_00.tzt tzt_reference_test_suite/map_mapstringnat_01.tzt tzt_reference_test_suite/map_mapstringnat_02.tzt tzt_reference_test_suite/mem_bigmapnatnat_00.tzt tzt_reference_test_suite/mem_bigmapnatnat_01.tzt tzt_reference_test_suite/mem_bigmapnatnat_02.tzt tzt_reference_test_suite/mem_bigmapnatnat_03.tzt tzt_reference_test_suite/mem_bigmapnatnat_04.tzt tzt_reference_test_suite/mem_bigmapnatnat_05.tzt tzt_reference_test_suite/mem_bigmapstringnat_00.tzt tzt_reference_test_suite/mem_bigmapstringnat_01.tzt tzt_reference_test_suite/mem_bigmapstringnat_02.tzt tzt_reference_test_suite/mem_bigmapstringnat_03.tzt tzt_reference_test_suite/mem_bigmapstringnat_04.tzt tzt_reference_test_suite/mem_bigmapstringnat_05.tzt tzt_reference_test_suite/mem_mapintint_00.tzt tzt_reference_test_suite/mem_mapnatnat_00.tzt tzt_reference_test_suite/mem_mapnatnat_01.tzt tzt_reference_test_suite/mem_mapnatnat_02.tzt tzt_reference_test_suite/mem_mapnatnat_03.tzt tzt_reference_test_suite/mem_mapnatnat_04.tzt tzt_reference_test_suite/mem_mapnatnat_05.tzt tzt_reference_test_suite/mem_mapstringnat_00.tzt tzt_reference_test_suite/mem_mapstringnat_01.tzt tzt_reference_test_suite/mem_mapstringnat_02.tzt tzt_reference_test_suite/mem_mapstringnat_03.tzt tzt_reference_test_suite/mem_mapstringnat_04.tzt tzt_reference_test_suite/mem_mapstringnat_05.tzt tzt_reference_test_suite/mem_setint_00.tzt tzt_reference_test_suite/mem_setint_01.tzt tzt_reference_test_suite/mem_setstring_00.tzt tzt_reference_test_suite/mem_setstring_01.tzt tzt_reference_test_suite/mem_setstring_02.tzt tzt_reference_test_suite/mul_int-int_00.tzt tzt_reference_test_suite/mul_int-nat_00.tzt tzt_reference_test_suite/mul_mutez-nat_00.tzt tzt_reference_test_suite/mul_mutez-nat_01.tzt tzt_reference_test_suite/mul_nat-int_00.tzt tzt_reference_test_suite/mul_nat-mutez_00.tzt tzt_reference_test_suite/mul_nat-mutez_01.tzt tzt_reference_test_suite/mul_nat-nat_00.tzt tzt_reference_test_suite/neg_int_00.tzt tzt_reference_test_suite/neg_int_01.tzt tzt_reference_test_suite/neg_int_02.tzt tzt_reference_test_suite/neg_nat_00.tzt tzt_reference_test_suite/neg_nat_01.tzt tzt_reference_test_suite/neq_00.tzt tzt_reference_test_suite/neq_01.tzt tzt_reference_test_suite/neq_02.tzt tzt_reference_test_suite/neq_03.tzt tzt_reference_test_suite/neq_04.tzt tzt_reference_test_suite/never_00.tzt tzt_reference_test_suite/never_00.tc.tzt tzt_reference_test_suite/nil_nat_00.tzt tzt_reference_test_suite/none_int_00.tzt tzt_reference_test_suite/none_pair-nat-string.tzt tzt_reference_test_suite/not_bool_00.tzt tzt_reference_test_suite/not_bool_01.tzt tzt_reference_test_suite/not_bytes_00.tzt tzt_reference_test_suite/not_bytes_01.tzt tzt_reference_test_suite/not_bytes_02.tzt tzt_reference_test_suite/not_bytes_03.tzt tzt_reference_test_suite/not_bytes_04.tzt tzt_reference_test_suite/not_bytes_05.tzt tzt_reference_test_suite/not_int_00.tzt tzt_reference_test_suite/not_nat_00.tzt tzt_reference_test_suite/not_nat_01.tzt tzt_reference_test_suite/not_nat_02.tzt tzt_reference_test_suite/not_nat_03.tzt tzt_reference_test_suite/not_nat_04.tzt tzt_reference_test_suite/not_nat_05.tzt tzt_reference_test_suite/not_nat_06.tzt tzt_reference_test_suite/not_nat_07.tzt tzt_reference_test_suite/now_00.tzt tzt_reference_test_suite/or_bool-bool_00.tzt tzt_reference_test_suite/or_bool-bool_01.tzt tzt_reference_test_suite/or_bool-bool_02.tzt tzt_reference_test_suite/or_bool-bool_03.tzt tzt_reference_test_suite/or_bytes-bytes_00.tzt tzt_reference_test_suite/or_bytes-bytes_01.tzt tzt_reference_test_suite/or_bytes-bytes_02.tzt tzt_reference_test_suite/or_bytes-bytes_03.tzt tzt_reference_test_suite/or_bytes-bytes_04.tzt tzt_reference_test_suite/or_bytes-bytes_05.tzt tzt_reference_test_suite/or_bytes-bytes_06.tzt tzt_reference_test_suite/or_nat-nat_00.tzt tzt_reference_test_suite/or_nat-nat_01.tzt tzt_reference_test_suite/or_nat-nat_02.tzt tzt_reference_test_suite/or_nat-nat_03.tzt tzt_reference_test_suite/or_nat-nat_04.tzt tzt_reference_test_suite/or_nat-nat_05.tzt tzt_reference_test_suite/or_nat-nat_06.tzt tzt_reference_test_suite/pack_address_00.tzt tzt_reference_test_suite/pack_address_01.tzt tzt_reference_test_suite/pack_address_02.tzt tzt_reference_test_suite/pack_address_03.tzt tzt_reference_test_suite/pack_address_04.tzt tzt_reference_test_suite/pack_address_05.tzt tzt_reference_test_suite/pack_bool_00.tzt tzt_reference_test_suite/pack_bool_01.tzt tzt_reference_test_suite/pack_bytes_00.tzt tzt_reference_test_suite/pack_bytes_01.tzt tzt_reference_test_suite/pack_bytes_02.tzt tzt_reference_test_suite/pack_chainid_00.tzt tzt_reference_test_suite/pack_contract_00.tzt tzt_reference_test_suite/pack_key_00.tzt tzt_reference_test_suite/pack_key_01.tzt tzt_reference_test_suite/pack_key_02.tzt tzt_reference_test_suite/pack_key_03.tzt tzt_reference_test_suite/pack_keyhash_01.tzt tzt_reference_test_suite/pack_keyhash_02.tzt tzt_reference_test_suite/pack_keyhash_03.tzt tzt_reference_test_suite/pack_keyhash_04.tzt tzt_reference_test_suite/pack_lambda_comb_pairs.tzt tzt_reference_test_suite/pack_list-bool_00.tzt tzt_reference_test_suite/pack_list-bool_01.tzt tzt_reference_test_suite/pack_list-list-bool.tzt tzt_reference_test_suite/pack_list_large_00.tzt tzt_reference_test_suite/pack_map-bool-unit_00.tzt tzt_reference_test_suite/pack_operation_00.tc.tzt tzt_reference_test_suite/pack_option-unit_00.tzt tzt_reference_test_suite/pack_option-unit_01.tzt tzt_reference_test_suite/pack_or-unit-bool_00.tzt tzt_reference_test_suite/pack_or-unit-bool_01.tzt tzt_reference_test_suite/pack_pair-bool-unit_00.tzt tzt_reference_test_suite/pack_signature_00.tzt tzt_reference_test_suite/pack_signature_01.tzt tzt_reference_test_suite/pack_signature_02.tzt tzt_reference_test_suite/pack_signature_03.tzt tzt_reference_test_suite/pack_string_00.tzt tzt_reference_test_suite/pack_string_01.tzt tzt_reference_test_suite/pack_string_02.tzt tzt_reference_test_suite/pack_string_03.tzt tzt_reference_test_suite/pack_unit_00.tzt tzt_reference_test_suite/packunpack_address_00.tzt tzt_reference_test_suite/packunpack_bool_00.tzt tzt_reference_test_suite/packunpack_bytes_00.tzt tzt_reference_test_suite/packunpack_int_00.tzt tzt_reference_test_suite/packunpack_keyhash_00.tzt tzt_reference_test_suite/packunpack_mutez_00.tzt tzt_reference_test_suite/packunpack_nat_00.tzt tzt_reference_test_suite/packunpack_string_00.tzt tzt_reference_test_suite/packunpack_timestamp_00.tzt tzt_reference_test_suite/pair_00.tc.tzt tzt_reference_test_suite/pair_int-int_00.tzt tzt_reference_test_suite/pair_nat-string_00.tzt tzt_reference_test_suite/pair_pair-nat-string-pair-string-nat_00.tzt tzt_reference_test_suite/push_00.tc.tzt tzt_reference_test_suite/push_int_00.tzt tzt_reference_test_suite/push_string_00.tzt tzt_reference_test_suite/read_ticket_00.tzt tzt_reference_test_suite/right_nat-int_00.tzt tzt_reference_test_suite/self_00.tzt tzt_reference_test_suite/self_01.tzt tzt_reference_test_suite/self_in_lambda.tc.tzt tzt_reference_test_suite/sender_00.tzt tzt_reference_test_suite/setdelegate_00.tzt tzt_reference_test_suite/setdelegate_00.tc.tzt tzt_reference_test_suite/sha256_00.tzt tzt_reference_test_suite/sha256_01.tzt tzt_reference_test_suite/sha3_00.tzt tzt_reference_test_suite/sha3_01.tzt tzt_reference_test_suite/sha512_00.tzt tzt_reference_test_suite/sha512_01.tzt tzt_reference_test_suite/size_bytes_00.tzt tzt_reference_test_suite/size_listint_00.tzt tzt_reference_test_suite/size_listint_01.tzt tzt_reference_test_suite/size_listint_02.tzt tzt_reference_test_suite/size_listint_03.tzt tzt_reference_test_suite/size_mapintint_00.tzt tzt_reference_test_suite/size_mapstringnat_00.tzt tzt_reference_test_suite/size_mapstringnat_01.tzt tzt_reference_test_suite/size_mapstringnat_02.tzt tzt_reference_test_suite/size_mapstringnat_03.tzt tzt_reference_test_suite/size_setint_00.tzt tzt_reference_test_suite/size_setint_01.tzt tzt_reference_test_suite/size_setint_02.tzt tzt_reference_test_suite/size_setint_03.tzt tzt_reference_test_suite/size_setstring_00.tzt tzt_reference_test_suite/size_string_00.tzt tzt_reference_test_suite/slice_bytes_00.tzt tzt_reference_test_suite/slice_bytes_01.tzt tzt_reference_test_suite/slice_bytes_02.tzt tzt_reference_test_suite/slice_bytes_03.tzt tzt_reference_test_suite/slice_bytes_04.tzt tzt_reference_test_suite/slice_string_00.tzt tzt_reference_test_suite/slice_string_01.tzt tzt_reference_test_suite/slice_string_02.tzt tzt_reference_test_suite/slice_string_03.tzt tzt_reference_test_suite/slice_string_04.tzt tzt_reference_test_suite/slice_string_05.tzt tzt_reference_test_suite/some_00.tc.tzt tzt_reference_test_suite/some_int_00.tzt tzt_reference_test_suite/some_pairintint_00.tzt tzt_reference_test_suite/some_string_00.tzt tzt_reference_test_suite/source_00.tzt tzt_reference_test_suite/split_ticket_00.tzt tzt_reference_test_suite/split_ticket_01.tzt tzt_reference_test_suite/split_ticket_02.tzt tzt_reference_test_suite/split_ticket_03.tzt tzt_reference_test_suite/split_ticket_04.tzt tzt_reference_test_suite/sub_int-int_00.tzt tzt_reference_test_suite/sub_int-int_01.tzt tzt_reference_test_suite/sub_mutez-mutez_00.tzt tzt_reference_test_suite/sub_mutez-mutez_01.tzt tzt_reference_test_suite/sub_timestamp-int_00.tzt tzt_reference_test_suite/sub_timestamp-int_01.tzt tzt_reference_test_suite/sub_timestamp-int_02.tzt tzt_reference_test_suite/sub_timestamp-int_03.tzt tzt_reference_test_suite/sub_timestamp-int_04.tzt tzt_reference_test_suite/sub_timestamp-timestamp_00.tzt tzt_reference_test_suite/sub_timestamp-timestamp_01.tzt tzt_reference_test_suite/sub_timestamp-timestamp_02.tzt tzt_reference_test_suite/sub_timestamp-timestamp_03.tzt tzt_reference_test_suite/swap_00.tzt tzt_reference_test_suite/swap_00.tc.tzt tzt_reference_test_suite/swap_01.tc.tzt tzt_reference_test_suite/ticket_00.tzt tzt_reference_test_suite/ticket_01.tzt tzt_reference_test_suite/transfertokens_00.tzt tzt_reference_test_suite/transfertokens_00.tc.tzt tzt_reference_test_suite/transfertokens_01.tzt tzt_reference_test_suite/unit_00.tzt tzt_reference_test_suite/unpair_00.tc.tzt tzt_reference_test_suite/unpair_pairstringstring_00.tzt tzt_reference_test_suite/update_00.tc.tzt tzt_reference_test_suite/update_bigmapstringstring_00.tzt tzt_reference_test_suite/update_bigmapstringstring_01.tzt tzt_reference_test_suite/update_bigmapstringstring_02.tzt tzt_reference_test_suite/update_bigmapstringstring_03.tzt tzt_reference_test_suite/update_bigmapstringstring_04.tzt tzt_reference_test_suite/update_bigmapstringstring_05.tzt tzt_reference_test_suite/update_bigmapstringstring_06.tzt tzt_reference_test_suite/update_bigmapstringstring_07.tzt tzt_reference_test_suite/update_mapintint_00.tzt tzt_reference_test_suite/update_mapintint_01.tzt tzt_reference_test_suite/update_setint_00.tzt tzt_reference_test_suite/update_setint_01.tzt tzt_reference_test_suite/update_setint_02.tzt tzt_reference_test_suite/xor_bool-bool_00.tzt tzt_reference_test_suite/xor_bool-bool_01.tzt tzt_reference_test_suite/xor_bool-bool_02.tzt tzt_reference_test_suite/xor_bool-bool_03.tzt tzt_reference_test_suite/xor_bytes-bytes_00.tzt tzt_reference_test_suite/xor_bytes-bytes_01.tzt tzt_reference_test_suite/xor_bytes-bytes_02.tzt tzt_reference_test_suite/xor_bytes-bytes_03.tzt tzt_reference_test_suite/xor_bytes-bytes_04.tzt tzt_reference_test_suite/xor_bytes-bytes_05.tzt tzt_reference_test_suite/xor_bytes-bytes_06.tzt tzt_reference_test_suite/xor_nat-nat_00.tzt tzt_reference_test_suite/xor_nat-nat_01.tzt tzt_reference_test_suite/xor_nat-nat_02.tzt tzt_reference_test_suite/xor_nat-nat_03.tzt tzt_reference_test_suite/xor_nat-nat_04.tzt tzt_reference_test_suite/xor_nat-nat_05.tzt tzt_reference_test_suite/xor_nat-nat_06.tzt
 tzt_reference_test_suite/transfertokens_01.tzt:
 Got output: { Stack_elt
     operation