diff --git a/docs/Makefile b/docs/Makefile
index ec77a41aa94b5e5e02520bc90950b99c4c9d221b..5497c2f127f97686582797ea54d7df9402068b52 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -21,7 +21,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
 nairobi_long  = PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf
-oxford_long   = ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4
+oxford_long   = ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH
 alpha_long    = ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK
 
 nairobi_short = PtNairob
diff --git a/docs/oxford/rpc.rst b/docs/oxford/rpc.rst
index 717055224855aad1aec75e719862a8707e959133..773296e3f9b215a6d04a4ccee33a31bebd44e65f 100644
--- a/docs/oxford/rpc.rst
+++ b/docs/oxford/rpc.rst
@@ -349,14 +349,14 @@ Full description
   <div id="GET_..--block_idoutput.json" class="GET_..--block_id tabcontent">
     <pre>
     { /* block_info_encoding_v1 */
-      "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "header": $raw_block_header,
       "metadata"?: $block_header_metadata,
       "operations": [ [ $operation ... ] ... ] }
     || { /* block_info_encoding_v0 */
-         "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+         "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
          "chain_id": $Chain_id,
          "hash": $block_hash,
          "header": $raw_block_header,
@@ -4577,8 +4577,8 @@ Full description
       /* A block identifier (Base58Check-encoded) */
       $unistring
     $block_header_metadata:
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
-        "next_protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
+        "next_protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -4654,8 +4654,8 @@ Full description
         "consumed_milligas": $positive_bignum,
         "dal_attestation"?: $bignum }
     $block_header_metadata_with_legacy_attestation_name:
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
-        "next_protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
+        "next_protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -4761,7 +4761,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -4769,14 +4769,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $018-Proxford.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4784,7 +4784,7 @@ Full description
              [ $018-Proxford.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4792,7 +4792,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -4801,7 +4801,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4809,7 +4809,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -4817,7 +4817,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -26448,7 +26448,7 @@ Full description
     { /* Shell header
          Block header's shell-related content. It contains information such as
          the block level, its predecessor and timestamp. */
-      "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
       "chain_id": $Chain_id,
       "hash": $block_hash,
       "level": integer ∈ [-2^31-1, 2^31],
@@ -26672,7 +26672,7 @@ Full description
             </div>
   <div id="GET_..--block_id--header--protocol_dataoutput.json" class="GET_..--block_id--header--protocol_data tabcontent">
     <pre>
-    { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+    { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
       "payload_hash": $value_hash,
       "payload_round": integer ∈ [-2^31-1, 2^31],
       "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -27154,7 +27154,7 @@ Full description
   <div id="POST_..--block_id--helpers--preapply--blockinput.json" class="POST_..--block_id--helpers--preapply--block tabcontent">
     <pre>
     { "protocol_data":
-        { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
           "payload_hash": $value_hash,
           "payload_round": integer ∈ [-2^31-1, 2^31],
           "proof_of_work_nonce": /^([a-zA-Z0-9][a-zA-Z0-9])*$/,
@@ -28162,13 +28162,13 @@ Full description
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": $block_hash,
         "contents": [ $018-Proxford.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
     $next_operation_with_legacy_attestation_name:
       /* An operation's shell header. */
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": $block_hash,
         "contents":
           [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
@@ -31804,13 +31804,13 @@ Full description
            "annots"?: [ $unistring ... ] }
     $next_operation:
       /* An operation's shell header. */
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": $block_hash,
         "contents": [ $018-Proxford.operation.alpha.contents ... ],
         "signature"?: $Signature.V1 }
     $next_operation_with_legacy_attestation_name:
       /* An operation's shell header. */
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": $block_hash,
         "contents":
           [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
@@ -45224,8 +45224,8 @@ Full description
       /* A block identifier (Base58Check-encoded) */
       $unistring
     $block_header_metadata:
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
-        "next_protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
+        "next_protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -45301,8 +45301,8 @@ Full description
         "consumed_milligas": $positive_bignum,
         "dal_attestation"?: $bignum }
     $block_header_metadata_with_legacy_attestation_name:
-      { "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
-        "next_protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+      { "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
+        "next_protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "test_chain_status": $test_chain_status,
         "max_operations_ttl": integer ∈ [-2^30, 2^30],
         "max_operation_data_length": integer ∈ [-2^30, 2^30],
@@ -51433,7 +51433,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -51441,14 +51441,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $018-Proxford.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51456,7 +51456,7 @@ Full description
              [ $018-Proxford.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51464,7 +51464,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -51473,7 +51473,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51481,7 +51481,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -51489,7 +51489,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61683,7 +61683,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -61691,14 +61691,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $018-Proxford.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61706,7 +61706,7 @@ Full description
              [ $018-Proxford.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61714,7 +61714,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -61723,7 +61723,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61731,7 +61731,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -61739,7 +61739,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -71919,7 +71919,7 @@ Full description
            "annots"?: [ $unistring ... ] }
     $operation:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -71927,14 +71927,14 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
            "contents": [ $018-Proxford.operation.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -71942,7 +71942,7 @@ Full description
              [ $018-Proxford.operation.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -71950,7 +71950,7 @@ Full description
            "signature"?: $Signature.V1 }
     $operation_with_legacy_attestation_name:
       { /* An operation's shell header. */
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "chain_id": $Chain_id,
         "hash": $Operation_hash,
         "branch": $block_hash,
@@ -71959,7 +71959,7 @@ Full description
         "signature"?: $Signature.V1,
         "metadata": "too large" }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -71967,7 +71967,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.contents ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
@@ -71975,7 +71975,7 @@ Full description
              [ $018-Proxford.operation_with_legacy_attestation_name.alpha.operation_contents_and_result ... ],
            "signature"?: $Signature.V1 }
       || { /* An operation's shell header. */
-           "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+           "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
            "chain_id": $Chain_id,
            "hash": $Operation_hash,
            "branch": $block_hash,
diff --git a/src/lib_protocol_compiler/final_protocol_versions b/src/lib_protocol_compiler/final_protocol_versions
index 2324a3fccd31488a64f7012cb3f05545a1640ce0..65e892c00767083444e2c865c069d53e13c7a4c4 100644
--- a/src/lib_protocol_compiler/final_protocol_versions
+++ b/src/lib_protocol_compiler/final_protocol_versions
@@ -18,4 +18,4 @@ PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg
 PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW
 PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1
 PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf
-ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4
+ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH
diff --git a/src/proto_018_Proxford/lib_protocol/TEZOS_PROTOCOL b/src/proto_018_Proxford/lib_protocol/TEZOS_PROTOCOL
index 2f0be24d75ea936041b8e5e2b67930b612ffb8e5..22503428f65a21e276cc9dba4757ec6d4b706666 100644
--- a/src/proto_018_Proxford/lib_protocol/TEZOS_PROTOCOL
+++ b/src/proto_018_Proxford/lib_protocol/TEZOS_PROTOCOL
@@ -1,6 +1,6 @@
 {
     "expected_env_version": 11,
-    "hash": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+    "hash": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
     "modules": [
         "Misc",
         "Non_empty_string",
diff --git a/src/proto_018_Proxford/lib_protocol/dune b/src/proto_018_Proxford/lib_protocol/dune
index 071340309d5a11787ec64b59565840abb96193f4..22daefede491e75a4fd14f9a5ad6ea6dfb49b6c4 100644
--- a/src/proto_018_Proxford/lib_protocol/dune
+++ b/src/proto_018_Proxford/lib_protocol/dune
@@ -314,7 +314,7 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Hashed.Protocol_hash.of_b58check_exn \"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4\"\nlet name = Tezos_protocol_environment_018_Proxford.Name.name\ninclude Tezos_raw_protocol_018_Proxford\ninclude Tezos_raw_protocol_018_Proxford.Main\n")))
+   "\nlet hash = Tezos_crypto.Hashed.Protocol_hash.of_b58check_exn \"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH\"\nlet name = Tezos_protocol_environment_018_Proxford.Name.name\ninclude Tezos_raw_protocol_018_Proxford\ninclude Tezos_raw_protocol_018_Proxford.Main\n")))
 
 (rule
  (targets tezos_protocol_018_Proxford.ml)
diff --git a/src/proto_018_Proxford/lib_protocol/init_storage.ml b/src/proto_018_Proxford/lib_protocol/init_storage.ml
index db8ffa047a8a13b87f920602f694dfd2cf7cd0d1..4d21ac9cd4eaa0d8dff4e30e62f45511e4b554a2 100644
--- a/src/proto_018_Proxford/lib_protocol/init_storage.ml
+++ b/src/proto_018_Proxford/lib_protocol/init_storage.ml
@@ -344,9 +344,6 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract
           Forbidden_delegates_storage.init_for_genesis_and_oxford ctxt
         in
         let* ctxt = migrate_staking_balance_for_o ctxt in
-        let*! ctxt =
-          Storage.Contract.Frozen_deposits_up_to_Nairobi.clear ctxt
-        in
         let* ctxt = clear_staking_balance_snapshots_for_o ctxt in
         let* ctxt = migrate_stake_distribution_for_o ctxt in
         let*! ctxt = initialize_total_supply_for_o chain_id ctxt in
diff --git a/src/proto_018_Proxford/lib_protocol/main.ml b/src/proto_018_Proxford/lib_protocol/main.ml
index 1be54a4fa9d5a4ebacbae3656a2cac39ff53ef72..d4315f2f3ce60524372a3e4bb7d3eb8169dca1f0 100644
--- a/src/proto_018_Proxford/lib_protocol/main.ml
+++ b/src/proto_018_Proxford/lib_protocol/main.ml
@@ -479,4 +479,4 @@ module Mempool = struct
          ~predecessor_hash:head_hash)
 end
 
-(* Vanity nonce: 8251168947906608 *)
+(* Vanity nonce: 7098603463799498 *)
diff --git a/tezt/lib_tezos/protocol.ml b/tezt/lib_tezos/protocol.ml
index 5c853655da34f4df0f659c71f3b58ea57a1995c9..f395244daca4258227dbdc8523f9c726058b500b 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 -> "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4"
+  | Oxford -> "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH"
   | Nairobi -> "PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf"
 
 let genesis_hash = "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im"
diff --git a/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- mempool.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- mempool.out
index 3599bccbf674b61a0d514bf6c36e632892d4c5bb..20945fe0efd377fc6ac1190aa9afb745c0ca514a 100644
--- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- mempool.out	
+++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode client) RPC regression tests- mempool.out	
@@ -1,10 +1,10 @@
 
 curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
 []
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -36,7 +36,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -53,7 +53,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -87,7 +87,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -103,7 +103,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -120,7 +120,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -150,7 +150,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -166,7 +166,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -183,7 +183,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -222,7 +222,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -242,7 +242,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [], "refused": [], "outdated": [], "branch_refused": [],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -262,7 +262,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [], "refused": [], "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -284,7 +284,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "branch_delayed": [], "unprocessed": [] }
 
 curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.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/Oxford- (mode proxy) RPC regression tests- mempool.out b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- mempool.out
index fee74a9e3f9d25c91f539174216745b5f9ab3e2f..58dc3c0a595fd9a445f078cf9a234506c8a87158 100644
--- a/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- mempool.out	
+++ b/tezt/tests/expected/RPC_test.ml/Oxford- (mode proxy) RPC regression tests- mempool.out	
@@ -1,10 +1,10 @@
 
 curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
 []
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -36,7 +36,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -53,7 +53,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -87,7 +87,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -103,7 +103,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -120,7 +120,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -150,7 +150,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
           "[SIGNATURE]" } ],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -166,7 +166,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -183,7 +183,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
               "expected": "2", "found": "1" } ] } ],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -222,7 +222,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [],
   "refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -242,7 +242,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [], "refused": [], "outdated": [], "branch_refused": [],
   "branch_delayed":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -262,7 +262,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
 { "validated": [], "refused": [], "outdated": [],
   "branch_refused":
     [ { "hash": "[OPERATION_HASH]",
-        "protocol": "ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4",
+        "protocol": "ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH",
         "branch": "[BRANCH_HASH]",
         "contents":
           [ { "kind": "transaction",
@@ -284,7 +284,7 @@ curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=
   "branch_delayed": [], "unprocessed": [] }
 
 curl -s 'http://localhost:[PORT]/chains/main/mempool/monitor_operations?applied=true&outdated=true&branch_delayed=true&refused=true&branch_refused=true'
-[{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4","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.018-Proxford.contract.counter_in_the_future","contract":"[PUBLIC_KEY_HASH]","expected":"1","found":"5"}]}]
+[{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.prefilter.fees_too_low"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.contract.counter_in_the_past","contract":"[PUBLIC_KEY_HASH]","expected":"2","found":"1"}]},{"hash":"[OPERATION_HASH]","protocol":"ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH","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.018-Proxford.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/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input254251340-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input254251340-.out
index 53c1a89fb1e596dd15fe1aba307728f6404de51e..1ea3f87f507cf7007365d43c156005c21ed385ce 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input254251340-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input254251340-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -abs--storage125992234--input420401245-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input420401245-.out
index de8c76ee1137369f2c4cf4b7dce46ca3cfb5f0fb..16fbfc837a119a12a16a04843ae5105c9156229d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input420401245-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input420401245-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -abs--storage125992234--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input680650890-.out
index 88ad5414b55e7c2e347947ae54a48c8eccdf3985..24f3a802c6730865b9c07ebf3522bf0774418a2d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -abs--storage125992234--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add--storage125992234--input125992234-.out
index f44709fc77f19f62e4520ff3026e6908200ca8f5..90f8e510dc4580309ba9da95c5afb6236323cce0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out
index 4c79155799405de06f7a5192e35dbbca830cc419..cec876d13f7bfcc865b8a12f88fc2e0c478b3689 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input322109491-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out
index 4f0bbc753d4f3ac3ef789a0f14df92752a937474..b52b32638142566b83666fd6de75f8784893c739 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input461261325-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out
index 1f6062cbf60d81524043c4f101aa2d6c231e31f7..5b078836f2da766c0155ae406c7ed66ee988e05b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input530006774-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out
index 0e37d1d1d181e67e7fc04e8fa3782b65a1a8996a..dacc303fdde3652d16b39ef0bbc83e8e90c408f3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_bls12_381_fr--storage921624073--input712570300-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_delta_timestamp--storage921624073--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input249636002-.out
index 3f2751d5e27f04ea34b39a6aaf5f930b3b160e90..7abd4a5ad39b74840cc699182c782ed9e3f52543 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_delta_timestamp--storage921624073--input267363182-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input267363182-.out
index da5daf1d83bb3d45cae3421d8b1cecbaf906b425..72ac97156f035bc3393c61a00184d2f39f112bfa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input267363182-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input267363182-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_delta_timestamp--storage921624073--input438561129-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input438561129-.out
index 9e8d02286a0b2fe0280742d6da872a7501a732c8..57a7010ce52640f949a18f8c37cc1061a5da2030 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input438561129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_delta_timestamp--storage921624073--input438561129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_timestamp_delta--storage921624073--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input249636002-.out
index ea982557b24075e4ecdb8b63a1a274c8281d712c..85985793db989739f05106462b7810cc50e1090d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_timestamp_delta--storage921624073--input307538219-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input307538219-.out
index fea7df26e77b75210b8bd0b1324adba83a69b1bf..feb1859b912bf7ff07eef2fa128398b745818f6b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input307538219-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input307538219-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -add_timestamp_delta--storage921624073--input373737581-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input373737581-.out
index a62409767ac640d4e82bf1bdbd10d38b9e5b68ad..e9f0380c14ffe7d7c5f2d245fe6a7d6b40c82b9c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input373737581-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -add_timestamp_delta--storage921624073--input373737581-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -address--storage921624073--input117475800-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -address--storage921624073--input117475800-.out
index 070962430c4d11c6bbce705e338bcebdb084efaf..d60f01e1a83537e49f154af57db9f4e10592cc95 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -address--storage921624073--input117475800-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -address--storage921624073--input117475800-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input106930123-.out
index e17bc7009eb9082e19ff2d66df8d44c85919af47..154e9daa856b6c4d8d03258af57d7cc7b3db888b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input181204719-.out
index 9ad1dc1455ecb2f07eabd15c25d3110c155ea62a..6f3b0237b6d16277d5c0eef52ed6bb961a7fdf1c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input223774825-.out
index 4c0782f2f82e23d187113fe4dd0a63806c0c2284..47efd9f7ee4d1a069eb46e6cac8f9a1bf9c0013e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input908807505-.out
index 5e1a711bdd3c69ac5c99eeac70bdfcbd4231f79e..c27d32f8911b30665d05756c5d64f25c09e3e8bd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_binary--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_binary--storage125992234--input125992234-.out
index 558fb3d7f444b9440c42d7987ddd90c9d789a831..e14fbecb6b0da913b65967f66f995aa9222173e6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_binary--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_binary--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_bytes--storage125992234--input125992234-.out
index c4084d7c4ba78e33deb9a16712eb1c3d2bbeb270..ec1e1c547d9723da7ae7d0f84ae7159e9fe33073 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_logical_1--storage570553153--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input106930123-.out
index 8865946c46bdedb81928ffd18e7e9fa184762bad..d4b2f34e80cde430e38ef5dfa8323bcb84d70463 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_logical_1--storage570553153--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input181204719-.out
index 6d6d85cc21b7dd61598b65bdaf9338ae4b373fa2..fb91f00ca4780d5a49a5c09d9e182a1a1a12d52d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_logical_1--storage570553153--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input223774825-.out
index 72b26f8c603b73a6b55f751b12be7b4c26566cd2..58d8f041b979495a31644ee79c9e8c6d4bb178c1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -and_logical_1--storage570553153--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input908807505-.out
index cfb23fb5436ffccbccd62afe8dd41a457348e26e..629f1aeab2adae91044f41a9600d9804c8c0f090 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -and_logical_1--storage570553153--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -balance--storage492856247--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -balance--storage492856247--input125992234-.out
index 6813a13ee7280fa514541c3b5ff28cf49708744f..f6800fca7c36e85ad913f8a79076601dbb8e0b06 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -balance--storage492856247--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -balance--storage492856247--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage495706788--input453441034-.out
index 4ed0f187b6692fa1509219ea74534a5558cefc50..414afff68aadd6523a51a413dcbae366cad2106e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input453441034-.out
index 38fee75503114ea8cd3767258e9fba34bff14e31..d5a3ec818f3f6b613a543881118d1843dee4ad20 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input564400327-.out
index 3a4364d57107750fd34ab72221de377f347f8870..fde9b4e6ac316a01f3045daeb11ba1625f5d3df7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input654274102-.out
index 37d9ab109b6df77f410619e9313389a7e0e997c0..a0b63d1d8110d0460a991dd589478e20e04d2f38 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage690637660--input453441034-.out
index 7c895d6779f94baeb4cda63fa667ed8e9c112c96..354048a9120960471aa731b2db4da8798f8db2ca 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage806237530--input453441034-.out
index 9ed454eee19783a100531f63f9140fd6ec384233..818cd09ce3fb673cc1271456f5222e704ce04771 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input1071610051-.out
index 3b29a9df0447f82f97952c5b9f2cceec24e7c50c..00ed1080ddd2fbdfdf5b5368ec09a9aa08aabeec 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input700475845-.out
index 1a575c3ded259f1cc66056dc968f934c30cb7180..d843f7e7ea0f6aace3a1baecf5ff38134eac4771 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input905318451-.out
index ec1f9a90de0997b8952f335924597e0f40041ddf..393fc401444baf846c17e8e5d148110be9961a62 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage495706788--input700475845-.out
index 772be29ce8b59f385232f1526beee676cbf7920c..05b327443c49bc456ca2cf191698c449308582d1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage915708427--input700475845-.out
index 8a5f513ae8420d367887784b7b1496204d7e48af..a4aacee9c8e5c4a74dbb8bc9d8b3c1af442db0f2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -big_map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage936682951--input905318451-.out
index 373f0a6f9179c951e10e84d874c99ed9bcf71ca3..f9e7eaa91e60104202cd7cb048c683c6eed53897 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input1259.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input1259.out
index 833045db85c57eaf723eda337047bcac5c702dcf..eea5b9713c132d1e8cdf5ece55a00df02aa4cc6d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input1259.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_bytes_not_padded--storage921624073--input1259.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out
index d3b60a7125d255f4e40e7e81b0cd0fd35060471a..f5d3c589ce16c258f31adfbe1b7770588ffd3605 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_push_nat--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out
index d17b511fef8ba66517498503acf18b171044a90b..a64230761ab508967237925c050083bff1d6d219 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input1043734173-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out
index 5f87f5b5eb3be007d54e63fc0ed5750bda74cd04..5b8e0773e46cfce28a3dd1e68312794659568ecf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input151303925-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out
index 65de0622f31c8649baf518c04162278d13430a23..afcb78acdf326385c0de69543944de6dbd646591 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input520610122-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out
index e7a6b5a5d8681e2f455c2dbaf8f6f2d010d334c3..0e7271c05a6b8d84d046651ca2d06c11d1968fe0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_int--storage680650890--input558805129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out
index 7caac778f6bede527587654b90951b83e4a1c729..b05dafa5e6b8979daee3760660d8634ccc9c2423 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_to_mutez--storage680650890--input229402968-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out
index 8a642f44eab67930cf044d2d56ee4824f383eb7e..800d777316c9aa3ad6b727761ee5fbd2d1dd5a4c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out
index 1471622749286b5e8712ac8f494746b4e3c68dc0..e63d1f260d936363f23a014a35ebcd75d913186b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out
index ca7c77a5cdfb0802acb0ae60f6be255bc342c148..1965cfed40f7491113f58710a6fddfaa5a56961b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out
index ba2d2178f993e78b1a0b69a46fcd2a7fc518ed21..74c342a934936b0687bbde6c3f8d9342978d4591 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out
index 0d5cd4e84195eb0c4a80554c59e3c20bb5e1fd87..9108ba3f076f0ec7ea3bcb93bdfb7fcb54b988ee 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out
index 7a42764dccd12df9c42c203b3629a77453cd879b..a8b50017974af15190e5267f88cf0347b95ca507 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out
index 6258715bb9488dc6a6bf14096686422af848c9c0..2a225e004139cbdf0762d748fce4353b90ef2656 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out
index 5e64f78f2c76439fa40666df05fc0661d5249fe3..c901bf45005c2c89b3fd86cf2b85d38fa70a40c7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input585234482-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out
index c5861fa059a27eb020e9640d974c35fcd2e3b367..a9a8f7379aebeb1b5953e4dbc501c8c4e1d77732 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out
index 7beeb9cd9f1f485dcad25afe21c6738fcbc34690..10812636c8eb3876efdf2904b1c924dc8bfe7596 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_int--storage994282947--input701858804-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out
index cc572454cbaabb4d9f89daba07807e7d97c859fc..3bb9281a1264197dbecc034240633685b84c4669 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out
index d315f72d5672248f385dd0cfb79ad34880a25cf9..5c9245a9c0d4371e370e33b3c197c9d58bfc79ea 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out
index 16e4f404a241807205b1aef2e321ff686f4262c7..6496c9e03c35cae9b3ee690a54dad79d582a63f4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out
index 6f10762ac23abcc2980ee88bd33067e4cbd5b1df..d9424aa5f4be283d782e57b935925fc72312b38a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out
index e83b0f2685bdf1e40215de83812349e58dbf0452..19798726056010975f976ca7b7d286737f872824 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out
index 13463d36966374b9c512564c825b09e1e4083c87..8a0cab94d851d9e2d54edcc99966e710ee0aaa6b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out
index 6710e3a09e471e8ed5e901c89ed1a4ce6a28196f..84d31e168ab11474d62bd5b99bc9d2ca1725a9a8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out
index 94ee8407268d27b4ae3cd4f4849f5e7d068bb5ec..ccda8c6d9caafb3b68ffb337f65f23c6d972d738 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_fr_z_nat--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out
index 5b3dc095d226f5a684f9627843cdf431522b63ae..21a602018537017bc3c464ce6cd7cac5b7c080a0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out
index 2946b92443fcfbaa57e5164025e49f1d3c29ea1e..11bdec2845e20210cab2127263e3afb36a07893e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out
index bf0e2d9b8ebde858fc6abf913d30ef8161ee2ac3..b627af6f4339d0b997f9fa3591f95c4e5bd66952 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out
index 9aab2d777fe29368007752011d0884a09962a1b1..908a0c296d5223401bdef021183c78cc6ed6369a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out
index 4757f7c0b1cfcfd7130356a93cd1893991c62967..961a101ea19f4cdf67707deaa75d2704f27b934c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out
index 324281d25ffc452bf1ba9b13a9b619f652ff4d4f..13feb9dd808a2b939f2caed4c9191e612066b43a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out
index 9378dd2e63af736a6dc1119b5b5368b52bd15ebc..b88788080889f8190e6f5e2b546759d76fe2cdc9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out
index 59628b1ce8fafad7ee519f47338eb2ef62e273f7..fc770eec398d8a30b5b43db4bff9a6dfdf058cec 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input585234482-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out
index c15a03bb6395a8f19a13f3531b3e7e6d2ecd082c..f07aed01dbc459f3438bb8dc2c2e9bec80fe0795 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out
index 12b73f3544a057f6d1c7aee8b175ee9fe445e432..6275c71d6ca6a3ec063683efdd5c0c83129a95ea 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_int--storage994282947--input701858804-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out
index 57f398b3d554e647184842661448087684e0cc59..e3eec8e922d63486f057c7294775b3b5359b011f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage287336412--input1019409032-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out
index 4e1e147293bd5696ea3663a2d54602e5c1a18ef6..10ff3bd1b336d1cba7728a28016bc1ce63c5b139 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage698210250--input949526473-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out
index 38add62701a3da48c4a1ab11d1f2704911ffb455..1fc30a5ed05618a77dd0b263a1602eeadafa6484 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input166435292-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out
index d75d623844a3b6fe70a405c93be007c17886618c..bead8029eb11b895488345028747d072667ffe3f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage739946440--input583291483-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out
index 35bc30e3343bd770c9374a79becaeb3583eafc5a..2b69a5b808706981902e3a61376f55158dddeba1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input1055524890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out
index 008c2d03ecf8030a86c1395f0c4021a7e650a19c..1ed6f98f85fc0da5f4db20c220897ffeb95ed10c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out
index af6e46386d1ce55db8e2b923cd6220eb9af7c330..0611d223ca5edd89661e5d8119d94fad7c111add 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out
index 8b44cb932a3dea484648ab5ea94044b1ea1af045..f10f8a0c24a97623c22ee104162329fa3beecac1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bls12_381_z_fr_nat--storage994282947--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bytes_of_int--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_int--storage125992234--input125992234-.out
index d7a567a371dc18380dd7700b775a868819a6c730..bc12dbb7173f0290fe82ff8ff78f1a0184a96080 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_int--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_int--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -bytes_of_nat--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_nat--storage125992234--input125992234-.out
index 5e17ea545ea3718eca24588abdd4dec040c6c8b9..71ffb6de1d5cb9001ee5a553d551a173cbaf5180 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_nat--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -bytes_of_nat--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -car--storage680650890--input783124233-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -car--storage680650890--input783124233-.out
index e35209b176818fb894fd997e5ed361e9534e7787..ae226316e05636ab29f70977bbc19a0b7020b320 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -car--storage680650890--input783124233-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -car--storage680650890--input783124233-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -cdr--storage680650890--input783124233-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cdr--storage680650890--input783124233-.out
index 215fc2fe8080b38f7de6b5bbba1a280e5b4d4319..d73c09ab9dbf4146506550f8a9d5eba175dfeb00 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cdr--storage680650890--input783124233-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cdr--storage680650890--input783124233-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -chain_id_store--storage109160754--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage109160754--input125992234-.out
index 020520a313d18f373842d22fdc1915a0a9ca0b20..43176db41b1b5d305188f998cfd05e2d3494dc51 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage109160754--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage109160754--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -chain_id_store--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage921624073--input125992234-.out
index dc8de99733f93d8de8fb48b1b546153172edd273..9f71d2fc33ce14f6ebc5456c76c0ee91e0b2b30d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -chain_id_store--storage981066851--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage981066851--input125992234-.out
index c1441ac9ef324b7663aacb799416b547f192ea01..688c47102d0c2b9a16542a230c7d3eea2e7f1925 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage981066851--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -chain_id_store--storage981066851--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -comb--storage950292965--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb--storage950292965--input125992234-.out
index 28512b51aa3a32f26195e8b7786b3693bf14016c..b6da08c7c59331da6434b8b74e3ec144e56d41b9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb--storage950292965--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb--storage950292965--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -comb-get--storage125992234--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-get--storage125992234--input186507116-.out
index f0e11dc08819f39cc0e490f1dd22bed039df2bb2..e9b7381f37b87c613afa591502e527a88ed1baab 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-get--storage125992234--input186507116-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-get--storage125992234--input186507116-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -comb-set--storage186507116--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set--storage186507116--input125992234-.out
index 09da46ca3dac7c9db51824afe6eb73e1f143f71c..a36f96c13a2d3be1eccc1cc1cdce99bb20241d17 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set--storage186507116--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set--storage186507116--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -comb-set-2--storage921624073--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set-2--storage921624073--input186507116-.out
index c23fcf02fb6c3cccb08f62cd7f492cd2b7966081..079f30a3a505298caa316a9e347abce0c0238a71 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set-2--storage921624073--input186507116-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comb-set-2--storage921624073--input186507116-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -compare--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -compare--storage125992234--input125992234-.out
index 8cc35ef9ed6e73181878ed27fbcf8da02022c7e4..a2db945992e657b82d8c20981f76efd5cfb65fba 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -compare--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -compare--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -comparisons--storage457300675--input281780712-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comparisons--storage457300675--input281780712-.out
index 5edf1be74ff3cd3709266d445bdb63dc02b651ac..eecad871af65c421463e117432383c47431b684e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comparisons--storage457300675--input281780712-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -comparisons--storage457300675--input281780712-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello--storage457300675--input392583650-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input392583650-.out
index 1085dc4a94757b7e9f8c90d30aed139d8fce75f2..7a9eef4c5909b9b3449541c147863da1305cf6c5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input392583650-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input392583650-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input457300675-.out
index 27de846c4c92d68bbbf6fcf4cc14e4c76d785cbf..46aeccfc36a0ef112178b94a420e039b504022a1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello--storage457300675--input640104625-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input640104625-.out
index 048472b5569ac77d32e96d9866319086aa7f8793..a6e3d9217d148714610f525ec78d6ef767d7b44b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input640104625-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello--storage457300675--input640104625-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello_bytes--storage457300675--input354091714-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input354091714-.out
index 9ae0b629182eb46b0a63978e5fd2796a8f8c730d..68643fa0ed451ed69aa5bbd8fd25f6f5bc39bac3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input354091714-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input354091714-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello_bytes--storage457300675--input441061063-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input441061063-.out
index de87766ca1b83c5525b0fa4818e152e4d0912307..85b705f3e2879069f9ca173ca058c098c734e8bc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input441061063-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input441061063-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_hello_bytes--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input457300675-.out
index 70c37113c96caa536cfcd23e156eddb1c80f79f6..0d21dedd9d7b96eb95f0a8bb2372c4ef5f919f6b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_hello_bytes--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_list--storage79230375--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input264787654-.out
index d3bcb53da440bce1eb725d73d1317d6f723df552..09519ca41bd223b7acb64e52915d12d5f4805bf7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_list--storage79230375--input316676251-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input316676251-.out
index b05dbbb234f7a4a028be55dc55d7e1c313b6c19d..499456873f67c7798a5ef21d731011d582cb762e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input316676251-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input316676251-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -concat_list--storage79230375--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input457300675-.out
index 52e7862f7da15c366c07394c43b89c27fab22e3b..4cfc3a0d650a6a9cb943f2da06677e9c5a624499 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -concat_list--storage79230375--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -cons--storage457300675--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage457300675--input798141440-.out
index 4e5d62a5121f2b87cc2effbe222544ea99b7304c..1dcfd555042e90fd04c8d1817b79248248c18da6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage457300675--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage457300675--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -cons--storage581876226--input166122047-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage581876226--input166122047-.out
index ac5a147c3063eabcf20a1fa068a87495eb3cfe7d..b90c4bb7ff1f9d026fa7a5e4ff8e3cf7c697c0f4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage581876226--input166122047-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage581876226--input166122047-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -cons--storage793461282--input781487591-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage793461282--input781487591-.out
index 8f9c6003afc926a59f64df83ac271b8d1934060a..54fc15a531679950d877afe485ce69110076ed3b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage793461282--input781487591-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -cons--storage793461282--input781487591-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input315650912-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input315650912-.out
index ec35a4491448d3e71d11a16bae364a400669a487..b24708d5522c1075a9feb45ebb3d8cf5c050f384 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input315650912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input315650912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input51111414-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input51111414-.out
index e784824f81a4550ef378f134956d9c16c8015b6b..baec55eeadbac00a1cbee750895d18e371db68f7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input51111414-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input51111414-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input545734274-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input545734274-.out
index 6f50e94c81a0e504508045a43e78a6c354d0abf8..be81c6668b479b0e2569ef51c96b356c977efb78 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input545734274-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input545734274-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input772794967-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input772794967-.out
index 9d659a1dbd459a82184552d9f7ad6790d3a91eaa..db83ec539dbb8a079a900f6cf50fac50eafaf908 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input772794967-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input772794967-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input917967660-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input917967660-.out
index e5b36f2ed8d646a32c3ed73c963de94695c166fa..e27ec245218ef522d021ff2f13b5e0aed0c7b5cb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input917967660-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input917967660-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contains_all--storage921624073--input964818218-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input964818218-.out
index 9f2ba394a0fa8fdf25f844c170d7b82fd1469de7..b0ecc63d6e00dcfeae1d3748bbf0b4ed583958b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input964818218-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contains_all--storage921624073--input964818218-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -contract--storage125992234--input117475800-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contract--storage125992234--input117475800-.out
index 13847e62ba074b09e81d21e33be2231bf48dc6d3..5829376bbe4bbcdfd8835e2e1178fe832eac5d26 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contract--storage125992234--input117475800-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -contract--storage125992234--input117475800-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -create_contract--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -create_contract--storage921624073--input125992234-.out
index f4c9b7aba826cb39d895d6b990533e6188beaefd..4ae56272e1171a4e1cd11e2932cdd5733133ec65 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -create_contract--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -create_contract--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -diff_timestamps--storage492856247--input1011138251-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1011138251-.out
index 3b0756ff93d694b6b969c72e743b3ae7873b1da9..6e937e48be95f936cbdc72c5b157756e93320592 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1011138251-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1011138251-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -diff_timestamps--storage492856247--input1018564342-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1018564342-.out
index 33937118aa05b31da2fcf9eece5150b572a24529..40e3b54ad77a552b3671815bf15f4767483699db 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1018564342-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1018564342-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -diff_timestamps--storage492856247--input1031049988-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1031049988-.out
index 0685c31ab47d24514b98074b1ac754079cb272ce..5d5844e4f71af882dfae63a23917a3d225515439 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1031049988-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input1031049988-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -diff_timestamps--storage492856247--input685590443-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input685590443-.out
index e5898b1a514d480392f1b5f37e13d8816c8ea35c..da5e8f6281d61da14680fee44ceb8a6feec6f8b2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input685590443-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -diff_timestamps--storage492856247--input685590443-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dig_eq--storage125992234--input246866101-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input246866101-.out
index 26010d90ca829d617ec8956d1bb018a1c0c1361f..0831b316587be0d53a4a6c05bebebfce94da87b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input246866101-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input246866101-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dig_eq--storage125992234--input26856104-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input26856104-.out
index 9d54d39f7ccef815767a2f03bc600d4bd248cd6d..186f1a22d21290a2f8ceb2579db4a10998433d73 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input26856104-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dig_eq--storage125992234--input26856104-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dign--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dign--storage680650890--input529388602-.out
index 1afde81481a0f5466cb753b5e67765af5527f696..6e4c13843d4d575ef4a31fafc8241a60021317ec 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dign--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dign--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dip--storage1011138251--input590117173-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input590117173-.out
index 7e27121f33ebe7bc691a875a5b528c4cd8be0b6a..9bb771918ec841227093be65be36cfd78ce0865a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input590117173-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input590117173-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dip--storage1011138251--input850887554-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input850887554-.out
index f898096d9c22f54bdc15b47925bbc7707dedb640..218fc16394a6c65d9d6e4c54e2c2c764d4ef9054 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input850887554-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dip--storage1011138251--input850887554-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dipn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dipn--storage680650890--input529388602-.out
index f74f1849e647cd1317bae24ba281320aececa223..77727790b0eca678d20da0272096a40d2f1c7868 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dipn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dipn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dropn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dropn--storage680650890--input529388602-.out
index 4763bbc991bb4bf25ae3713429c0b654628f1cc5..d0b21cbb5ab947129d389c4e55e10b7a461f00c1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dropn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dropn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dugn--storage680650890--input529388602-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dugn--storage680650890--input529388602-.out
index 4e48f4e52a887da72452d74f7cede6639b84bf9e..2913c9814c01bf2c0185fc8ec6fc68637a829a2a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dugn--storage680650890--input529388602-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dugn--storage680650890--input529388602-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -dup-n--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dup-n--storage125992234--input125992234-.out
index fcfe0a54f3ae3ea24d7a62c2c2580c68bfc222be..f52c1470adf07c7dec3c4d52940ed1a1148704fa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dup-n--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -dup-n--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv--storage994417987--input247451205-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input247451205-.out
index d567738496c9ae85406b334e06b8fe85e37c8a89..9a0b208fadb65af7f96df09f9227e4c7e4203b7a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input247451205-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input247451205-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv--storage994417987--input250545589-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input250545589-.out
index fc9600dbb905eca675ba58c728012ea57468766e..c5531fca608c0dea3b6822100f820fce76b57534 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input250545589-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input250545589-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv--storage994417987--input79625541-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input79625541-.out
index bb566a7976526b6e51d3d2f3f2c9b2311ed479f5..8eac04005757cb3006b96159936e0d4c2c83c4c9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input79625541-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv--storage994417987--input79625541-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input147133089-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input147133089-.out
index ca74d3b8dfa19b128528c2b86cdbfcde71d62db9..e37879f49709519cae0865e2741228801b32fb89 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input147133089-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input147133089-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input215785357-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input215785357-.out
index afa724f0eed3c74de5ea6f4d2c95d01db6f8a0d6..073f202b4fe182218d8f810273b15e369953f579 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input215785357-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input215785357-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input389351431-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input389351431-.out
index a0d8a4d70fda65faf4384d322fa84c8472797104..9bd555862d94dfea9207f4e384c67a544d696080 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input389351431-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input389351431-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input44513000-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input44513000-.out
index 43d6d756dd443d52df4c3f8fc157556ef35addfd..bf2033ba579388427c075d671ccad3b153ab381d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input44513000-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input44513000-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input635398196-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input635398196-.out
index 288960907f9a59246e510f64dd7453858e8865ba..e59f5d036432f68d7ff421a839c901b0e70cf5c8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input635398196-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input635398196-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input734264738-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input734264738-.out
index f04a1984ac8c404639cc77a987348ff0e76e3609..110653e1d7286bcc72dbc391e322ce0f4dd7f16f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input734264738-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input734264738-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ediv_mutez--storage977883604--input993071382-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input993071382-.out
index bbcbb363be0b185773c5310024bbd21536768b0d..985099844cbe594b0f3741fd32b0fd9996a61d1c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input993071382-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ediv_mutez--storage977883604--input993071382-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -emit--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -emit--storage125992234--input125992234-.out
index bb2e56fc488e3c5b9378ee16989151a450030352..c47927e155753ea51d68d9acf4752bf5a367dc9f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -emit--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -emit--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -empty_map--storage457300675--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -empty_map--storage457300675--input125992234-.out
index 4ea2878cfc7d6b1fce170717a336f75f8727795f..31b64a93f6691ae0db1828c285c2cc7dcc605cce 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -empty_map--storage457300675--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -empty_map--storage457300675--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -exec_concat--storage398998998--input246262487-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input246262487-.out
index 42b4fde958ff637740a8f0e45cf593931bd7f26f..13f170600bfcb02b7300bd15ff5fd9428fea9769 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input246262487-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input246262487-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -exec_concat--storage398998998--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input79230375-.out
index 7fbb0fbb144cf40839d8e644eba8d4aa34f33262..4b3277a4c319f81e4ed1530e0671aa5cc80656b9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -exec_concat--storage398998998--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -first--storage492856247--input478406404-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input478406404-.out
index 02a5b5a194343ffee01daa3cff4ca3686596d3a2..95f586e40b0d4e6e66c42869d76d3b502ef3efaf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input478406404-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input478406404-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -first--storage492856247--input962874972-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input962874972-.out
index 925af688caee9d7c0f9408cbae19b624073188d3..4178a18350fa72c979c729169732776fa8a58d5a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input962874972-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -first--storage492856247--input962874972-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage1026405794--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage1026405794--input329240220-.out
index 03cbcf2c829e093dc6a9e71409fcfdee4418aed1..654f03cc0a618d42125324bda11e0fc0f3d560ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage382368661--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage382368661--input329240220-.out
index b985a6a8f79bf539be40021f38ab51173496902d..5e10f16001950026962579989f2e05a46dcb0d4e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage382368661--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage382368661--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage496578814--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input329240220-.out
index fbe1648f6378fbac514830ea71ed688ad24e8366..728512c2080ba52791b1e2a8edddf0b22cdb7a06 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage496578814--input507231566-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input507231566-.out
index 05632fc50c44e1ccb21ed67b054fd81edb10972d..88c05ef2b928f477ebee87eae14a22ffafe8fc4a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input507231566-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage496578814--input507231566-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage547821324--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage547821324--input329240220-.out
index 0db762ada631152f8f4ce007f0680f0dde763417..00f1100daff97039cf58c17adbc4af07aef19861 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage547821324--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage547821324--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage796012494--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input156280093-.out
index f417b7827643d5da07653b63e36f60c66b32e441..3e3530c49494e306e264e5f2f4578d5717d38375 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input156280093-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_and_update_map--storage796012494--input228164856-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input228164856-.out
index 2a9f5a31a3cbff5392f5f1dbdacbea748a31d9d4..d3871371baef26215cb563c870612d2009d9bdc0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input228164856-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_and_update_map--storage796012494--input228164856-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_map_value--storage139236239--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input329240220-.out
index 076932d51d44004a216aa19cd082266b661897da..86c56e1c9d2041f750c827675a33ba17e1c0d695 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input329240220-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_map_value--storage139236239--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input79230375-.out
index 530dcdd100cee436716cb5662b41be6b4e102fae..5f49938739a50770375192b41f9654b0ed7483ff 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage139236239--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -get_map_value--storage329396864--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage329396864--input156280093-.out
index 168475cf13c7409375b8a0b30b656929f7af411c..e64a39c9ac2b604201cdca45d17f95a514b16d57 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage329396864--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -get_map_value--storage329396864--input156280093-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -hash_key--storage921624073--input1040351577-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input1040351577-.out
index af9287649fa9891c8db435b0fb2a690c6b35ff10..0818c10aeaf96e80ed0e750bd3357eba6119fed1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input1040351577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input1040351577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -hash_key--storage921624073--input153350004-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input153350004-.out
index 5989a4f32d72a884d0130b99f0508bf3150fcc49..81a912857742b2ebb8b8b981a970ef36baa59d9e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input153350004-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_key--storage921624073--input153350004-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -hash_string--storage151303925--input3431716-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input3431716-.out
index 4339c7ed4e9ba643ebe62f235c6da180959f61f9..af62877421b07192999a9c5d6bc8bcd6276daa46 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input3431716-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input3431716-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -hash_string--storage151303925--input535018041-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input535018041-.out
index ece6fb780c34c7d912889b7f9545b28c4f48c6a0..925b255ed47e63d2efffcb0712b42947b1cca579 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input535018041-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -hash_string--storage151303925--input535018041-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -if--storage921624073--input570553153-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input570553153-.out
index 8e40d1728e8ec8b015df643cc9445883f17fe9f3..2135ceb8db2d5af6fd530e0a2de0a86858f4c25a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input570553153-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input570553153-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -if--storage921624073--input954397288-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input954397288-.out
index 48a27c22a1dc50e81701fc777040e9ae36c2244b..229a29c384549274853dd1624c88f4db0f49143f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input954397288-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if--storage921624073--input954397288-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -if_some--storage398998998--input288201633-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input288201633-.out
index 095ba6b9927a5e033f5b2e87cacf21ef054dc141..8bdff3fbd9764ee49641ed1e9f32c7cbad135774 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input288201633-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input288201633-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -if_some--storage398998998--input921624073-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input921624073-.out
index 89d3bb404fe44d97946e874b6a1ce0b8143ae840..7c00b2f9f20061216ceeecafcec9329e24c22859 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input921624073-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -if_some--storage398998998--input921624073-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -int--storage921624073--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input453441034-.out
index 138ba13cd03708dfc02c2f8f51cb4dbc15639b95..6bd98a81b82b3b454685bc65c592ad7270dff9cc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -int--storage921624073--input535454136-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input535454136-.out
index 35d95892bd2621ab6954d0c5893f5afdd50b3063..3cb48b1f98ea5174a2700caef2aacb6b9b23b233 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input535454136-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input535454136-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -int--storage921624073--input680650890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input680650890-.out
index fc67b93242fa12183b5944f7120b73c67c730661..e71d5bd6abb573b21aa2fa4e8af52e09583f79d5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input680650890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -int--storage921624073--input680650890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -keccak--storage921624073--input1008262038-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -keccak--storage921624073--input1008262038-.out
index 2a901a116344ddacf4ba3c77c9f566305bb55886..0e61053571d982738eded13b208817c0385f6e55 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -keccak--storage921624073--input1008262038-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -keccak--storage921624073--input1008262038-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -left_right--storage4177631--input202098045-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input202098045-.out
index a1b8ffc0995cce52b7b51a8cc432f3cbc79b8462..3ab3c7ce5223cd9537ffd203cb35a26142f56904 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input202098045-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input202098045-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -left_right--storage4177631--input44576556-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input44576556-.out
index d43071e545804d191632eb54fec750fb9815b1d8..4df435e218456eb39a5657b8b2529e83090c6e25 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input44576556-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -left_right--storage4177631--input44576556-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -level--storage492856247--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -level--storage492856247--input125992234-.out
index fb755c8cc7a1f1396c9b19a866504502baea18f8..2ecb24badf65629d8760eba47499f60db3ecfa20 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -level--storage492856247--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -level--storage492856247--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat--storage717096222--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input457300675-.out
index e35e6e290c2e6a56247757a3ecc3ec1c85cc505e..df6fa4a71ac2d3a075605181098ce9a460440225 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat--storage717096222--input546523343-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input546523343-.out
index 93fdaefc69362f532412134c1f1eb48320ea4aa1..7d76ac6531328f77d6a8e6dad17ef0e43cb9cd0f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input546523343-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat--storage717096222--input546523343-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat_bytes--storage149262694--input220724351-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input220724351-.out
index 8f2963ed6b5819c6281e0a6b077100b20fed3c0f..5d7be45110ed7bdae0eb216dbb8dece12f338958 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input220724351-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input220724351-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat_bytes--storage149262694--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input457300675-.out
index 5e1dd87d65b39ccc32b35e6888dcdb3a5eb73f51..2eff7ae721617f9ce5b10c8d5927b1c24c939451 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage149262694--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat_bytes--storage65410082--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage65410082--input457300675-.out
index 33a63acb11bdac2b26dce17ce2ea41b2d74f64df..5eb8f9d34a1354782f4a8e31be83ca092b78cdff 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage65410082--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage65410082--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_concat_bytes--storage726220441--input972761363-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage726220441--input972761363-.out
index c6f5711d050f2152afe9833a5e8365424069e678..8ea07d8301a63939c23eb06d29f7732bbbd61c10 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage726220441--input972761363-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_concat_bytes--storage726220441--input972761363-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input264787654-.out
index f7570462da80fe2dfcdf8115628eb4b0cfcd1dde..757bb51ae0b6a5910ff0bb18e2bd4d85f255d011 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input457300675-.out
index fe24de48829b56d71cb4cb3d0048bdcd3225f9ef..66c340663d0f7590d713c0a0320b48c3dd1d3474 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input656499821-.out
index c1a5ab686f98458fe034b7f585b24510273d683a..8324aa6f514f0c0e49202bd9df4204aabc6ad472 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id--storage528921618--input656499821-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id_map--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input264787654-.out
index 49c7a0e9584dc0523b59aec3f9412847840e69a4..ca092f0ff7e72063ff53de97d57eeb9c1f515e2b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id_map--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input457300675-.out
index 73f83f2a06a20c436c71ebe8aaed89d7627461e8..913a3e703be07c5c8626e286545d2d138ce9c473 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_id_map--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input656499821-.out
index 95faab554a26d28e515edeef4e1741bca5dd815f..636fcaa7d7b8e61b81e36bcbfb889fb11ab40ac3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_id_map--storage528921618--input656499821-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_iter--storage680650890--input568817463-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input568817463-.out
index 1706b8d8b51d1dbe2108cb8170354029a8d9fc5c..b2a8bda12810e335162630dcf01c54c2c0b037f7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input568817463-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input568817463-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_iter--storage680650890--input737923774-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input737923774-.out
index de012026777ec867fe0607990e4960609fc24453..de2e78c631651ac5f34dd422f0bac71fcd02259d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input737923774-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_iter--storage680650890--input737923774-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_map_block--storage907453363--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input457300675-.out
index 1bad1ca4f7aefdc417dff2a63dd1b0ee8da04e38..b7f84cf67f7184a162ea760f35d0819dec5c213c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_map_block--storage907453363--input648737279-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input648737279-.out
index b8a79f0a081667f6d69e643d191c203918b4d1f4..420c3b26de836d8d9113122ec6eae131e0d0ca5c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input648737279-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input648737279-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_map_block--storage907453363--input908379154-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input908379154-.out
index 1d4f307d8d0743478b735c51207e1a5f394081e4..b227ec7cce36d74dbb172528978a86bd74d7fc48 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input908379154-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_map_block--storage907453363--input908379154-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_size--storage492856247--input403499055-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input403499055-.out
index f60cd4b0293c1b172be973defd2b87360e877ca1..d79aed590b5b9547d8be4bfa9cbb7ee03aed3f6b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input403499055-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input403499055-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input457300675-.out
index 5cbb6b98b7f3249e4282bece001367454ae680e5..f3f90eac5af683c40aa4ba2fae6c2e2a185545f0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_size--storage492856247--input469078912-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input469078912-.out
index 86656b393307ed030badf8a8548c2b14b30a5d08..3a5fac10b238bfe12ad75ba42d760cdbaed77be6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input469078912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input469078912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -list_size--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input802622031-.out
index 4b85ef057aa170a5dc8a41bce9ac60490c31eb2d..7314320608ac9425c544c2e1341ac6586c095d3f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -list_size--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -loop_left--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input457300675-.out
index 14e24eaf6536263913d9a349133bdf7a9c8f587e..43c85b6b4079bcdf41701156c690fee5b34f82fd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -loop_left--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input851203613-.out
index dbd4bbc0447cb9e6e6fe74989d125037d8e9f5de..d9437d4afb78835a67ed18fdfb5817d12479ed88 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -loop_left--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -lsl_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsl_bytes--storage125992234--input125992234-.out
index 1ed7b532e2071521569085099c633c982e282535..3565913a75eec887ed4b33d841d7793ff0bb4555 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsl_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsl_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -lsr_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsr_bytes--storage125992234--input125992234-.out
index f65d5a18c21a573e743156b9804e1fa84236bdc9..2f7b864d7cf19e72cd6b1e44c6acf598923b05d2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsr_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -lsr_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_id--storage457300675--input1027566226-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input1027566226-.out
index d5d5e71f0a8ba3ce4cec431e7f7e34ca873af105..6f32bf6d4143a4cccd7db09f41cd052ad3df82d2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input1027566226-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input1027566226-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_id--storage457300675--input276660554-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input276660554-.out
index b2c69cabc33eb1ec5d0747e2eecd91b4cf693a65..e3cc9d4acc376fd8b85ce986be61d37c12321788 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input276660554-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input276660554-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_id--storage457300675--input599923743-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input599923743-.out
index 8d673a5b6c71a5c7541380c4b8cafe81afff15f4..2b5207c6dfb962776f403db5e0a50d3732d4885c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input599923743-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_id--storage457300675--input599923743-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_iter--storage1011138251--input403579222-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input403579222-.out
index 5a4066b76b151ba68367fac3fe627f5c25017d86..6ae38c63cc7e37e710ae93525d259b3d86b469e3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input403579222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input403579222-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_iter--storage1011138251--input532072758-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input532072758-.out
index 4f759ed18c02f02d869536364b76d06ba27797e8..869877738598e28e624459506b588cbcdefb919e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input532072758-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_iter--storage1011138251--input532072758-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_map--storage457300675--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage457300675--input798141440-.out
index 59d57aad41de30b60737c66ea8daeac623f0e0c1..ca0a56ae80b8caf8562388daf3ec624eae129221 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage457300675--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage457300675--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_map--storage794999348--input152441147-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage794999348--input152441147-.out
index ad2a5caa2cbe99177ebf0611b50b0b8e8d34e324..31bb48741e8ca5034470b71623e3fe2977c8f6f0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage794999348--input152441147-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage794999348--input152441147-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_map--storage88008216--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage88008216--input798141440-.out
index e77d4f694a062d620b61a70fceebc867cc58e276..338c772f54c67f15d0f0b379ad95e9411bd43b6f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage88008216--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_map--storage88008216--input798141440-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage495706788--input453441034-.out
index 5e993456f4ea3d894e3d1051fe115efc1184fab7..b562cc5e399133ecce423d8e558e508a915f2500 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage495706788--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input453441034-.out
index 059be9e0909e041c1adb2111336010dfa6e49e40..11e74e41c8208c6c1e5bc0c1b327c464b6bd88a9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input564400327-.out
index 937a93e7d263067336def331dbd98d8139fdeff1..e8753396b1d937620db3f3218371a26a2fd97c1b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input564400327-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input654274102-.out
index 36f6a39bf38dfc908ee4aa5dfbd92ab8f835dcef..1252eafe6ff758959e697a71de0c1110027a2ae5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage56274299--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage690637660--input453441034-.out
index 9408c56fb666965af6e5c5a1e2e34c431d329879..f53891c1472a4082ff949ca6fdfb5deec02689f6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage690637660--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage806237530--input453441034-.out
index db51a93d96c60121508ac218fe443fbc157c4a28..8e4ff85669c1ec33444f94ade133febdce8105b5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_nat--storage806237530--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input1071610051-.out
index ef098bd5b4c11b80dc2f989f52efd0a9a8b20314..dacff153e86bc6ac94d9e3d79645e56f70c0d1ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input1071610051-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input700475845-.out
index 25d96fdd3776e1c6438407d7b7bc281e2ba39f2c..d5f38286b785280a7836f517c07b5568b48636e4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input905318451-.out
index fe029dd27236df27451d3f200fa58439fe4f351b..c166ed250fa1b002452874c54091dac1ba5fb19d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage109689253--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage495706788--input700475845-.out
index fd368d094b329224e4c2b8994bf4c67196f9d4d2..23ecc624a8ec83f1cd56aa17e59c7a79cbbf7c26 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage495706788--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage915708427--input700475845-.out
index 60eb86613b918c850660552c07237faad1a725a6..8c5d6a163e25a1834f9b5e2af15004dde47d0eb3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage915708427--input700475845-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage936682951--input905318451-.out
index 1eb2550c3f1227e1934a5bf40b7dbaf6293164c7..008311f0849d6b65d1e8552010303c3197e65fa3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_mem_string--storage936682951--input905318451-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_size--storage492856247--input15265129-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input15265129-.out
index f7605988a3f954d481cb733ba190a64e67c55334..c0d672e36c0941e3bb5c86e4d0994091e18353f2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input15265129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input15265129-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_size--storage492856247--input158311065-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input158311065-.out
index f4c914c18fc1f6b35108b6b5492aed717eb3cca3..8ca711fa7386b90cf96845ac5f68cfb616a34659 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input158311065-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input158311065-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_size--storage492856247--input456982702-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input456982702-.out
index 7d5639cd20017788cbf040d056a80c48e379f80d..3fea4eb9ad2e70529fe6208f7cd60137d1087e4a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input456982702-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input456982702-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -map_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input457300675-.out
index 807c06d85575612dfded675361350e0fff2bb0bb..dbe4cbef1fa36f6603b7477c1f4cb7c130df509a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -map_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -mul--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mul--storage125992234--input125992234-.out
index 84b5bd7d3eca53c835dd4204489127386ae799c7..2e3ebe3b808dced385aecc050e7b92f1cf9ac0e7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mul--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mul--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out
index 953fd81a710352e1c6574d514c08e95939c4ffb3..56b085b76fc79b94b42fcac29bff306348fb3d58 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage151303925--input216277421-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out
index b4c10148e03622affb82f80a477a3bf89dabc48e..d960984dac29f48eabc1581c229791449867268b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -mutez_to_bls12_381_fr--storage287799761--input485842614-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -neg--storage680650890--input1067298059-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input1067298059-.out
index 8fad1b9be05268a1f90397fcc07deb9e37a7a3a9..8a21378aba746e4c4d1b7dbdabf6b830a9782e57 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input1067298059-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input1067298059-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -neg--storage680650890--input380029349-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input380029349-.out
index 9dbd7df7f86901d6a0de4a37524b8069c6f9acca..cca6918b7f4d1a8836f2fd6011d0f7c7b7619cca 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input380029349-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input380029349-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -neg--storage680650890--input563503226-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input563503226-.out
index ed82c4175df4f0ed4dd96b631a97d75275e51eb0..653aef1f19a40ca8a5eac7f85bd0c72b27ac6d3a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input563503226-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input563503226-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -neg--storage680650890--input788662499-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input788662499-.out
index 28772dafb638bb6a9e380ece64ef33f3779b4214..24becd47d2165910bfa779fab1e66049d9baa4d7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input788662499-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input788662499-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -neg--storage680650890--input972832189-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input972832189-.out
index 0416d0cf8b237bdb3b737e9a33d5bacdf78c01dd..3541183dbd987adef53686b85973952d73846d97 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input972832189-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -neg--storage680650890--input972832189-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -none--storage11179311--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -none--storage11179311--input125992234-.out
index c5bcdf132040386377f76109f61c5feb0f53579e..5be7144fa55d34b09ad3e3121d36a7455fc0db23 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -none--storage11179311--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -none--storage11179311--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not--storage921624073--input570553153-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input570553153-.out
index d10b3ad81aabd7f639d91ca642cf5846b1d0e2e5..a17263475df7b9570352def52d795d14e1b2611b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input570553153-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input570553153-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not--storage921624073--input954397288-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input954397288-.out
index d5aea82c7c420654f69d12f9e0ea407a768a123f..63fc49a7b376e42435ec8afa2ffadae8b3980479 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input954397288-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not--storage921624073--input954397288-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input1051197453-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input1051197453-.out
index b869a5ecb2a7500eaa78d7706f6ef3d541419930..e3e7fe454a3c630b106620f8912a64ba0cd9a740 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input1051197453-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input1051197453-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input123939249-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input123939249-.out
index f16da267f93b7ae3407b99845bdbf20edb2e361c..597d7868018a0986e90cdcdadc0293a035a8d920 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input123939249-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input123939249-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input24243730-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input24243730-.out
index 732c96e4c5ab7e36471602a53bbd601e3d90b49e..70bca1c6d35a197791bb79a61544cc4841c1c2cf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input24243730-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input24243730-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input518945720-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input518945720-.out
index 87130adcf12edc1af4f9818e7d02252ae6b0a874..4dd9a451a144af4929da8d57ace2c898eb72a607 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input518945720-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input518945720-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input788662499-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input788662499-.out
index 6b1a78ec8772357df4f05a045c6377537f8ff4e3..28720f9da832febfdd8f5673ba2f1a7859856039 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input788662499-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input788662499-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input906118781-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input906118781-.out
index 46330024fe7b38b25cfe21906f774c20fcfc61ea..073db0698de18fe7eba35c46459bdd248998533b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input906118781-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input906118781-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input921874253-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input921874253-.out
index bef4f625f7a59a2032ec73930db01e38e3e595ed..4f78c9e94a56a733ee4a3dbab39ced1af918df4c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input921874253-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input921874253-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_binary--storage921624073--input972832189-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input972832189-.out
index 0b5880d403bea831a4661f5f3272402421b0bf26..e25c452b39f07576f4a33ca98e9afe035d6114eb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input972832189-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_binary--storage921624073--input972832189-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -not_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_bytes--storage125992234--input125992234-.out
index ecab528e6a4cb89a8f23fc449328d39407fcc84c..5d4faf7283238ffeefb053aa16244e7dc70751fb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -not_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input106930123-.out
index 8f8de0cc2a097987887972a50f1e2218bba7cfc8..6a1fd163ff95d47eba706e1308b248868b9155aa 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input181204719-.out
index f70b227a5a78230ef70bd72e237d824ebe3baaad..c46f9158813f1ab38812277c926473ae1d9b52ff 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input223774825-.out
index d120f0e6c11b6f43ebb3b3891b058e1443148434..8404cf6fb9b6ff056be5da90af38cd47fa9c1d1c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input908807505-.out
index cac5edc2a30d7cbf5714486da74a7179e2319945..e1d4b89bf41d0a7b475fc9c6550538ec5f871652 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input1056991424-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input1056991424-.out
index 0193ee6ff0981b92512f86f6ff018990f7f5481a..5f4b3d8017804d709b69b64faf394b90146ce739 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input1056991424-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input1056991424-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input375993021-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input375993021-.out
index 8bd9cc093decb8d153c48a2de8e3d71a5bf73c75..6f99dfdf91ee4564607406301c88758f1ddcbf18 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input375993021-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input375993021-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input673240563-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input673240563-.out
index 0f751aad47a699d6ace319a2b48c30643dd93c16..9b619b0c26843e2f490784d336cfafa2bf72e6e9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input673240563-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input673240563-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input747448890-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input747448890-.out
index b1eb563fa0b26ecfec51e593c600a1324ea7bad3..ae6d6c8623c186ab2fa7808650e931167825c4ee 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input747448890-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input747448890-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input832403787-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input832403787-.out
index d2c25e096e79be1843081aa3a38c95798b0f3f1c..5b5418dc4e4b67d252b311760866f91694791840 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input832403787-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input832403787-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_binary--storage921624073--input858098961-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input858098961-.out
index 21f51a6f3621c9c95a847d7b1b3e92997654b4a2..8ba3bb29f5300dff68bd38f3b6d8df1e46ecb514 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input858098961-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_binary--storage921624073--input858098961-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -or_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_bytes--storage125992234--input125992234-.out
index 0e190959d9d5e250e19fae2685da0280c7163c17..019eee8321c60e97bee08d9bcd7e0ac691988334 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -or_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -packunpack_rev--storage125992234--input305844558-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input305844558-.out
index e7e82a18f0d45e71a874c1e6ee87c58d3dad96fa..7fef309dcb8c7e14179e77dd42d98d7656125265 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input305844558-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input305844558-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -packunpack_rev--storage125992234--input646365167-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input646365167-.out
index a90b5db577179e07ff52919d7e659b80e2413213..6135ce48ba57de67967f3465cb7fd04e9539d77d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input646365167-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev--storage125992234--input646365167-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out
index 5f629b1f75025a88ccbe99c7b78783a1cf32014f..edec7b4cc6d73309afa53f371e5966b65c48c073 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out
index febe8708737371212bd51da33e2ddc225c59f956..6bd39b802db13c28f97d065dc64a3c0892ff55db 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -packunpack_rev_cty--storage125992234--input802670583-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pair_id--storage921624073--input106930123-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input106930123-.out
index 3839c2d1293e303a293327a11c81e57893f01720..30a763ddcf14d7c741a99bb5cd474c15192fef55 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input106930123-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input106930123-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pair_id--storage921624073--input181204719-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input181204719-.out
index f2a606735d5020fc70acce8a068700fb0e5fa4dd..eb0fb3ceba6c817e73afdd9e0d68bca4b24d248d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input181204719-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input181204719-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pair_id--storage921624073--input223774825-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input223774825-.out
index b05b8e62ebe1c047cc4fb931dfcfe8125bf52afa..cf05cb0056721a267d4e1ea63d1b206def932c98 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input223774825-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input223774825-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pair_id--storage921624073--input908807505-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input908807505-.out
index eda34f9fd48d1330c5ac797fc56321c74caf7fa4..b0bc7a5f110834786472d67ba3e07c5ab07081bf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input908807505-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pair_id--storage921624073--input908807505-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pexec--storage256947135--input1050356042-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec--storage256947135--input1050356042-.out
index 8ef94fa9f57aef27538684e3307b5df12accbc02..2ebc6831f2d12c67f517d75869f2d8c01d2df396 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec--storage256947135--input1050356042-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec--storage256947135--input1050356042-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -pexec_2--storage197120858--input179371027-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec_2--storage197120858--input179371027-.out
index 14670018a9ff079240a6ad34fb09772e76a86897..f896c53aaeec8f0d76bb5c5a0dcc6df4d710ca34 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec_2--storage197120858--input179371027-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -pexec_2--storage197120858--input179371027-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -ret_int--storage921624073--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ret_int--storage921624073--input125992234-.out
index 2d7d6bb398577f2c8424701006494285434371d6..860a1516eb622f4978a0870d2963e5dc8b8d8f52 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ret_int--storage921624073--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -ret_int--storage921624073--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -reverse--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input457300675-.out
index 343481dde935ebbe2931341f98c66d2918e4a0ed..1933c8b66e27913f30e65c95f3073f4ebcb48786 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -reverse--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input851203613-.out
index febbe336c704f975dc67ccdc831e673657345a64..a7fc7935445211430cff29e1059c3de9d13c88cd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -reverse_loop--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input457300675-.out
index bce36377a878e8be53f7ecb2fa5aa5828aab1338..8fc5d2787c0458ac492df3b1d076d9da562e48b5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -reverse_loop--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input851203613-.out
index e535936b1d5ec3eb84b3e8d9eccf68946444e660..1db42d71b035ab0a5bed7b00e6905e7f27cc9a53 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -reverse_loop--storage528921618--input851203613-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -sapling_empty_state--storage457300675--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sapling_empty_state--storage457300675--input125992234-.out
index eee0a8a229ffe7ef75227ec3bd2a0f2cf9369ff2..5a4b6483ff9e6f4b3b8ba5c327b8381775ac1b86 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sapling_empty_state--storage457300675--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sapling_empty_state--storage457300675--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -self_address--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_address--storage125992234--input125992234-.out
index 64c5aa5f66dc433de664b23ef6e4b5969165aca3..9707ad2be6dcd0a33bb0a8975b1664b03daf77bc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_address--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_address--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out
index dac38e68fc9f372fad34bc475591f4202cb6ff64..845df9b3dc0cd16946331b2f6c0475a336dd746b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_default_entrypoint--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -self_with_entrypoint--storage125992234--input289072903-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_entrypoint--storage125992234--input289072903-.out
index 4afd6db0dd6b73b4681125581196ca94badf98a4..236a6e84c3c10c48a4eb9943ae42173e55ebcff4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_entrypoint--storage125992234--input289072903-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -self_with_entrypoint--storage125992234--input289072903-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_car--storage224747103--input620760059-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input620760059-.out
index 93a4b0dc59168dfa973f6cd06db4e1fbe44afc5c..29f6ab43c913566bf0929a894daf4c395ff57c9f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input620760059-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input620760059-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_car--storage224747103--input717096222-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input717096222-.out
index 46f92ad770694e4a2caeea3e0be14e4a37567d2c..93213b0ea7cc92c60bf895429b8a6b4ffe12c13a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input717096222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input717096222-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_car--storage224747103--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input79230375-.out
index 5ebac6540e37f4b9ffe50287d3af512756eaa62a..ca7c483aa95759465ec4d976ae1c245b0bf47937 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_car--storage224747103--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_cdr--storage205576101--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage205576101--input654274102-.out
index 1ec4a455f52b7ecd61c36322c328abfba636aca3..030a369bdc8d9e24cc758928c7227323c9d992c8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage205576101--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage205576101--input654274102-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_cdr--storage224747103--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage224747103--input453441034-.out
index 27c744d37710a0d8f54e281577d6d22aec1f56a8..070bd9cad0eb744cc38a5acd188307e0fc90cd6d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage224747103--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage224747103--input453441034-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_cdr--storage611418174--input967284912-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage611418174--input967284912-.out
index ea386707ca697a0092460ecc9b6618f98ac0bf16..3d3c63afdf580a56d5aadf1095c693579816774f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage611418174--input967284912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_cdr--storage611418174--input967284912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_id--storage457300675--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input264787654-.out
index 364c8c8dd014cddc24e0cf79a92522f37efa2099..666987a4c685e3d8c9d8fea3c6a4ff8435a8919e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input264787654-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_id--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input457300675-.out
index ed3c997eac5a5fd40be05614f8bebec25960019e..8eb77910f554f52771cc8858d1becb1d2365c60c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_id--storage457300675--input989507347-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input989507347-.out
index 2f3632286d681fc1764de02d067c10160e2d08d8..150862981520e8acad229e50c80e4f028c03f2cf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input989507347-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_id--storage457300675--input989507347-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_iter--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input457300675-.out
index 12ceeefcd417aa330420a329d94ebca02b59278c..64f322fd31402f6c3c244856e469c66bc0cd2794 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_iter--storage492856247--input701684511-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input701684511-.out
index b69aeb22afbb812da574e4b66c9b86c3b927d18c..c820d2a95c0cecb5da45192923222f555ac40a31 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input701684511-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input701684511-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_iter--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input802622031-.out
index 27c4497b22dd3ad388aab6d0e2722a8fa7a9bb9c..e9a2a2f2f9a65a9b8085d77679cfeb9991b17581 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_iter--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_member--storage495706788--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage495706788--input33757838-.out
index 065ab02554442b5c3c1d27c22d8329b2c0debf75..3704fc9a4c70bcb392a779945fdee393ed593fbd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage495706788--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage495706788--input33757838-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_member--storage550087893--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage550087893--input79230375-.out
index 178c4dd91bceb50e1cc7a5dfc4edb354795fecfb..5371d4f53c11ca800a5e2c2bbb7be3169009d678 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage550087893--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage550087893--input79230375-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_member--storage605111220--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage605111220--input33757838-.out
index 986016b3f0c39e07d8e610127203d40471dbd695..f8306bcdfb0ec7928e5a99d8b4599d1af7dfa2ac 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage605111220--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_member--storage605111220--input33757838-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_size--storage492856247--input403499055-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input403499055-.out
index b5024a124a5e08c5ae167a7d97872ccb19a0a3bd..77b23b6d6963683b431d95b1e8c45833ee7c902a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input403499055-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input403499055-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_size--storage492856247--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input457300675-.out
index 32fa4991e5f4b793d0ad693a08cb22d15ca558f1..337c961a71f2bdd47e55db7f3a6df827d1075fdb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input457300675-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_size--storage492856247--input469078912-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input469078912-.out
index a8810dded5a36099dc911af2370e359c7c475973..95e66dadecf8b926c53afe2de7750403428450ca 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input469078912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input469078912-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -set_size--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input802622031-.out
index d731a1dd380a477d3b074d5fe78ba593c5147941..712d4013e779eaeb17e4b2bbc75c2adb2fa65143 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -set_size--storage492856247--input802622031-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -sha3--storage921624073--input1008262038-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sha3--storage921624073--input1008262038-.out
index 59a7455563438eed5e24a9192e8281b057bb99bd..8ecdb164ba7481c4b32e16078765453c76837f05 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sha3--storage921624073--input1008262038-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sha3--storage921624073--input1008262038-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input115382786-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input115382786-.out
index c1cf0c19b355e71f6a5c586b77f922fc4b831739..db685bdc22008cb967c1908002958da85fcf8d68 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input115382786-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input115382786-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input271566295-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input271566295-.out
index a5150d723fab957f2f0d94a916c569b32975f4b7..049a72e664f3974bb80c4e12a49fe516daddf845 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input271566295-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input271566295-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input340971987-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input340971987-.out
index 47ebe2cb6cb60511312026a5717524f95df27716..a5a5d7de5577eee2a7448b6a45ad0ee52d8000a5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input340971987-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input340971987-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input374168553-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input374168553-.out
index ca8bf277332745ddc625c6b05818ad24a0e60b62..a8d3a1f6e2f455d62265fb158733eb2083fe235a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input374168553-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input374168553-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input413621582-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input413621582-.out
index b7ce0e7c3e3e2160ab70738d64149ac84e81e231..36b1bd7e0c38807cc963a1df311e41c6df7a101f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input413621582-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input413621582-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input424849461-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input424849461-.out
index 694ea5b8a119f8a0931a14e18b0adaed18a42107..9fbd7d70fad10c2937995af27668a09c832351b5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input424849461-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input424849461-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input485030042-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input485030042-.out
index d8d67ed7e13852d7f2482c8f8635959d5d1adb1f..1609afa43a33548abacacb06667cbc12a334f7b4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input485030042-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input485030042-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input705767726-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input705767726-.out
index cd58a013a2910d69581b79d4286bc21ff258f6a8..450f48171af602f19a8940ba14469d5559e84b7e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input705767726-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input705767726-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input769385932-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input769385932-.out
index de38babdf6b2ea25eb6aade52e99fb370ec2e496..55792fba128c1719a7ad20c0f94cbfdb4ebfb9f9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input769385932-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input769385932-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -shifts--storage921624073--input913715337-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input913715337-.out
index 6d83aad83c658e8785a0ccf8a9f4e18b2406a215..c8330d217ce4afd97101bc9fb51e9509234043d4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input913715337-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -shifts--storage921624073--input913715337-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage351480851--input65907686-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage351480851--input65907686-.out
index 5aff0c48ba21e2f8fe8083262cd06604dd9781bc..4d5c70ca578a0a2be10aad9c0900d6dac6d45b13 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage351480851--input65907686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage351480851--input65907686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input198821575-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input198821575-.out
index 5bfe752b5ba2f7575ea800341b5debb28fb1bf64..db9a210e0c9929634622e371be9676751e46125f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input198821575-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input198821575-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input359592843-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input359592843-.out
index 76618bde6447b59be0a384f9f9d1941b363d91bb..5bff459b5d39b5b31bdecaffce8a17659bb4ef99 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input359592843-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input359592843-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input551316239-.out
index b5d958fdda0bb2a53e052124fa41be8a92a9a68f..03ddbab70484202cbb77b7079309081ec14c2805 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input722749044-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input722749044-.out
index 585c1f54bbcbcddf331d557c9212bc2f34789037..1c2885704f20de66cb9ee12cb2a2bc2bc5eeb944 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input722749044-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input722749044-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input839234860-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input839234860-.out
index 6b342c004308db1fbd2be34b6109ed051376bd82..8eacbcbe5dfb8e8cd57783057d0e52368a692274 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input839234860-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input839234860-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage364922380--input919180079-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input919180079-.out
index cc317d4e88e2da1ec165d0ba15183f02a4f646f9..1b66a98bac2e3f1fd15056fa9a1b391797cf8d14 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input919180079-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage364922380--input919180079-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice--storage921624073--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage921624073--input551316239-.out
index 33ac2395a53c3c53456aaeebf2b6f43d25e5eb7d..56f499bbd86490e9cf364f5dd7bdac81da9b2ba4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage921624073--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice--storage921624073--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input198821575-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input198821575-.out
index 9c091792ba4141834da245f61062b4099f8d7f98..8ea69e8a14201083148b505fd3013f7181257782 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input198821575-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input198821575-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input462551352-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input462551352-.out
index 358f1a7a6ed78befb005a16b923cd819b71b3b0f..ee296979fcb2bbdf7e1441a86d97a307fbc30d2a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input462551352-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input462551352-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input489157380-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input489157380-.out
index ed8fc5fb70541297f68bed90ad7e1e1b804be3b2..9586afae6678752a4ffefbe441760d8a55f08619 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input489157380-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input489157380-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input551316239-.out
index 19f23bc7a1f4fa254158aa880bdd24a1d7ec1ea6..0a5daf42e0e88fa5abaae63e84db585978ef72b8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input551316239-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input669330759-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input669330759-.out
index a59e5392e904c363e03c684abc9cbf55c5db7091..71ec00cefd77b27b78dbbe79c718c1d68fbc5a28 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input669330759-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input669330759-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input743596105-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input743596105-.out
index 2643ba05110da7c5c2355ea315196bf1cd9f1e3d..63ddfae39508d6bf48115c80291487f24cae09c7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input743596105-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input743596105-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage229749865--input839234860-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input839234860-.out
index 3eaada6c50c3fd1b041d3ef4f8ae90f1a9c30553..1c7205493eb3c2c639a67dcb55b34eef1105d6e2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input839234860-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage229749865--input839234860-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage504917929--input65907686-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage504917929--input65907686-.out
index 1ffb068db033ecb8b4bb3ae77e089188c7239c25..3c02ec41350a9a7c6f8ae71525f3d79980c72fdd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage504917929--input65907686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage504917929--input65907686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -slice_bytes--storage921624073--input462551352-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage921624073--input462551352-.out
index 8ae4d631beac11116f164f9e956c534c0e37305f..d1d02a4896e759b9431f7f5e970fa2437cd659b4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage921624073--input462551352-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -slice_bytes--storage921624073--input462551352-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -str_id--storage921624073--input1016369050-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input1016369050-.out
index 83a9205ea47a6597bdfe39af9ec38b960021a765..5c9c4d99365898b9d2b8f430d986f81d9373c678 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input1016369050-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input1016369050-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -str_id--storage921624073--input93477117-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input93477117-.out
index f3ba13d5d4a25c6fdf875597e6dbc05053494242..ece6058ab0fb21a86616867190832e6a10e54d8b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input93477117-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -str_id--storage921624073--input93477117-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out
index 62a5c7f8a8ab4705146724f3fe934af3d87683f3..1dbabc50bf2aee66c5aab0805b2835b22ce64750 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input249636002-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out
index 5224b7e058eb034c43fd17b775b97d15f1cea5bd..966fa3205d31546b01b80044be1fec450b282b34 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input307538219-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out
index 7c4789e73632ee567511e7e2d3ee40693dfe3323..796b5751edff04aa09e080f3eaed8cc951126e71 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -sub_timestamp_delta--storage492856247--input831449542-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -tez_add_sub--storage921624073--input706350605-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input706350605-.out
index cceb9615f716ae14ea405774f7ccff004c66522a..466089ce5352a37273241e8701cde2eb92db8c40 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input706350605-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input706350605-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -tez_add_sub--storage921624073--input856198194-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input856198194-.out
index f3784c16af7da580ebcd330fdd0c71d713ee59ea..22b57cf9144f140dbb8a43a5777a643a1b18a03a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input856198194-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -tez_add_sub--storage921624073--input856198194-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -uncomb--storage680650890--input394061083-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -uncomb--storage680650890--input394061083-.out
index 3fa7a85e44837db3cb8b05412c5d3e95f90b31a3..3c23d8604b16be56ddbd9404763430d06e4aa519 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -uncomb--storage680650890--input394061083-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -uncomb--storage680650890--input394061083-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -unpair--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -unpair--storage125992234--input125992234-.out
index caaf4eb241fbcefe6db4367ed414444598cb42e5..abec57bf1039be527dc45c6c9c232ffb46551d1b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -unpair--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -unpair--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -voting_power--storage1011138251--input1040351577-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -voting_power--storage1011138251--input1040351577-.out
index defa811315fa05d9901faeb26c9f270d844b3b94..3fc7062d6ed71d2da1c2bfa9a9e10b6a6f22d6f9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -voting_power--storage1011138251--input1040351577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -voting_power--storage1011138251--input1040351577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input1058477720-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1058477720-.out
index 4f1c41e8df2e3782ba68b5d96e23d79ba367610d..f7759cf3869edd1aeaa4ad38658909bff1225cf1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1058477720-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1058477720-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input1073176155-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1073176155-.out
index 14a055d78a35ba9bbec63b0101fc88f5594a74e4..de844adc71b965eb8fe96d884cf6297a7ecab243 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1073176155-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input1073176155-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input246594902-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input246594902-.out
index e0c66dffa09d78ac9faafa6ee0efab99b0d8f7a9..f8c4e16977c6a30beef626b3c3e3e643fc594569 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input246594902-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input246594902-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input506603577-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input506603577-.out
index 8dffae1ac341d10e1e046db4da7e50a8e2c6c67c..403d5e92796319e938f2f7150130954b33beca5b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input506603577-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input506603577-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input576248088-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input576248088-.out
index da596b302767ad8b406d7ed75cb761c1634398f2..e19455988033bf5c35da2d1f61fae64c415fb749 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input576248088-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input576248088-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input612012282-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input612012282-.out
index 05783d14d3ff53a08ec3fe10b4e747610edaef33..89989a3bf0365124e6cf8e041f1d3017f2771c24 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input612012282-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input612012282-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input617591686-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input617591686-.out
index f85e178840515781115c588194665a66bcd5d0f8..7c59e0298be893e54c4b2eeaf8e5db1407befa54 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input617591686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input617591686-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input639311176-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input639311176-.out
index 26e2a2e65bc220c7c1308f0478e13f80ac6ec813..65455d293452ffef82ae804514175af76cc3b5d9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input639311176-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input639311176-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input688315180-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input688315180-.out
index 58fb9ac42a5d894ff2387c6f4d33af3c2c8416b0..068d680c0e822673d51c7ab2b5ac411a0229a91b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input688315180-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input688315180-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor--storage921624073--input967929605-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input967929605-.out
index b8e99098e6b7051da4e57ffb7e93b7d17d403209..5838448819f2a8cae5567431a9418e5c9f8dda28 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input967929605-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor--storage921624073--input967929605-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- opcodes -xor_bytes--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor_bytes--storage125992234--input125992234-.out
index 0881ab84cdcf2df23ce9c3f3c731a484dd36a88d..253aef99f95fffc0a1e16cedeefe02442b0d7f4f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor_bytes--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Oxford- opcodes -xor_bytes--storage125992234--input125992234-.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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/Oxford- Tc scripts.out b/tezt/tests/expected/contract_typecheck_regression.ml/Oxford- Tc scripts.out
index 4c62e05ce7ead3713a8f8c597cb80ae51147e763..e2fd48b23098e21cb6139b5927fadf051f8e47cd 100644
--- a/tezt/tests/expected/contract_typecheck_regression.ml/Oxford- Tc scripts.out	
+++ b/tezt/tests/expected/contract_typecheck_regression.ml/Oxford- Tc scripts.out	
@@ -1,5 +1,5 @@
 
-./octez-client --protocol ProxfordXomTQ2AyWMVdAzJvbhGm2nGzBuDvovb4Rn6UGmgZ5s4 --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 ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH --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)