From c9115c392fbed2a2894e7573b682eea1d22de841 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Mon, 4 Dec 2023 17:58:26 +0100
Subject: [PATCH 1/2] Everywhere: Update protocol hash

---
 docs/Makefile                                 |  2 +-
 docs/oxford/rpc.rst                           | 98 +++++++++----------
 .../final_protocol_versions                   |  2 +-
 .../lib_protocol/TEZOS_PROTOCOL               |  2 +-
 src/proto_018_Proxford/lib_protocol/dune      |  2 +-
 tezt/lib_tezos/protocol.ml                    |  2 +-
 ... client) RPC regression tests- mempool.out | 34 +++----
 ...e proxy) RPC regression tests- mempool.out | 34 +++----
 ...abs--storage125992234--input254251340-.out |  2 +-
 ...abs--storage125992234--input420401245-.out |  2 +-
 ...abs--storage125992234--input680650890-.out |  2 +-
 ...add--storage125992234--input125992234-.out |  2 +-
 ..._fr--storage921624073--input322109491-.out |  2 +-
 ..._fr--storage921624073--input461261325-.out |  2 +-
 ..._fr--storage921624073--input530006774-.out |  2 +-
 ..._fr--storage921624073--input712570300-.out |  2 +-
 ...amp--storage921624073--input249636002-.out |  2 +-
 ...amp--storage921624073--input267363182-.out |  2 +-
 ...amp--storage921624073--input438561129-.out |  2 +-
 ...lta--storage921624073--input249636002-.out |  2 +-
 ...lta--storage921624073--input307538219-.out |  2 +-
 ...lta--storage921624073--input373737581-.out |  2 +-
 ...ess--storage921624073--input117475800-.out |  2 +-
 ...and--storage921624073--input106930123-.out |  2 +-
 ...and--storage921624073--input181204719-.out |  2 +-
 ...and--storage921624073--input223774825-.out |  2 +-
 ...and--storage921624073--input908807505-.out |  2 +-
 ...ary--storage125992234--input125992234-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 ...l_1--storage570553153--input106930123-.out |  2 +-
 ...l_1--storage570553153--input181204719-.out |  2 +-
 ...l_1--storage570553153--input223774825-.out |  2 +-
 ...l_1--storage570553153--input908807505-.out |  2 +-
 ...nce--storage492856247--input125992234-.out |  2 +-
 ...nat--storage495706788--input453441034-.out |  2 +-
 ..._nat--storage56274299--input453441034-.out |  2 +-
 ..._nat--storage56274299--input564400327-.out |  2 +-
 ..._nat--storage56274299--input654274102-.out |  2 +-
 ...nat--storage690637660--input453441034-.out |  2 +-
 ...nat--storage806237530--input453441034-.out |  2 +-
 ...ng--storage109689253--input1071610051-.out |  2 +-
 ...ing--storage109689253--input700475845-.out |  2 +-
 ...ing--storage109689253--input905318451-.out |  2 +-
 ...ing--storage495706788--input700475845-.out |  2 +-
 ...ing--storage915708427--input700475845-.out |  2 +-
 ...ing--storage936682951--input905318451-.out |  2 +-
 ...ot_padded--storage921624073--input1259.out |  2 +-
 ...nat--storage921624073--input125992234-.out |  2 +-
 ...nt--storage680650890--input1043734173-.out |  2 +-
 ...int--storage680650890--input151303925-.out |  2 +-
 ...int--storage680650890--input520610122-.out |  2 +-
 ...int--storage680650890--input558805129-.out |  2 +-
 ...tez--storage680650890--input229402968-.out |  2 +-
 ...nt--storage287336412--input1019409032-.out |  2 +-
 ...int--storage698210250--input949526473-.out |  2 +-
 ...int--storage739946440--input166435292-.out |  2 +-
 ...int--storage739946440--input583291483-.out |  2 +-
 ...nt--storage994282947--input1055524890-.out |  2 +-
 ...int--storage994282947--input453441034-.out |  2 +-
 ...int--storage994282947--input564400327-.out |  2 +-
 ...int--storage994282947--input585234482-.out |  2 +-
 ...int--storage994282947--input680650890-.out |  2 +-
 ...int--storage994282947--input701858804-.out |  2 +-
 ...at--storage287336412--input1019409032-.out |  2 +-
 ...nat--storage698210250--input949526473-.out |  2 +-
 ...nat--storage739946440--input166435292-.out |  2 +-
 ...nat--storage739946440--input583291483-.out |  2 +-
 ...at--storage994282947--input1055524890-.out |  2 +-
 ...nat--storage994282947--input453441034-.out |  2 +-
 ...nat--storage994282947--input564400327-.out |  2 +-
 ...nat--storage994282947--input680650890-.out |  2 +-
 ...nt--storage287336412--input1019409032-.out |  2 +-
 ...int--storage698210250--input949526473-.out |  2 +-
 ...int--storage739946440--input166435292-.out |  2 +-
 ...int--storage739946440--input583291483-.out |  2 +-
 ...nt--storage994282947--input1055524890-.out |  2 +-
 ...int--storage994282947--input453441034-.out |  2 +-
 ...int--storage994282947--input564400327-.out |  2 +-
 ...int--storage994282947--input585234482-.out |  2 +-
 ...int--storage994282947--input680650890-.out |  2 +-
 ...int--storage994282947--input701858804-.out |  2 +-
 ...at--storage287336412--input1019409032-.out |  2 +-
 ...nat--storage698210250--input949526473-.out |  2 +-
 ...nat--storage739946440--input166435292-.out |  2 +-
 ...nat--storage739946440--input583291483-.out |  2 +-
 ...at--storage994282947--input1055524890-.out |  2 +-
 ...nat--storage994282947--input453441034-.out |  2 +-
 ...nat--storage994282947--input564400327-.out |  2 +-
 ...nat--storage994282947--input680650890-.out |  2 +-
 ...int--storage125992234--input125992234-.out |  2 +-
 ...nat--storage125992234--input125992234-.out |  2 +-
 ...car--storage680650890--input783124233-.out |  2 +-
 ...cdr--storage680650890--input783124233-.out |  2 +-
 ...ore--storage109160754--input125992234-.out |  2 +-
 ...ore--storage921624073--input125992234-.out |  2 +-
 ...ore--storage981066851--input125992234-.out |  2 +-
 ...omb--storage950292965--input125992234-.out |  2 +-
 ...get--storage125992234--input186507116-.out |  2 +-
 ...set--storage186507116--input125992234-.out |  2 +-
 ...t-2--storage921624073--input186507116-.out |  2 +-
 ...are--storage125992234--input125992234-.out |  2 +-
 ...ons--storage457300675--input281780712-.out |  2 +-
 ...llo--storage457300675--input392583650-.out |  2 +-
 ...llo--storage457300675--input457300675-.out |  2 +-
 ...llo--storage457300675--input640104625-.out |  2 +-
 ...tes--storage457300675--input354091714-.out |  2 +-
 ...tes--storage457300675--input441061063-.out |  2 +-
 ...tes--storage457300675--input457300675-.out |  2 +-
 ...list--storage79230375--input264787654-.out |  2 +-
 ...list--storage79230375--input316676251-.out |  2 +-
 ...list--storage79230375--input457300675-.out |  2 +-
 ...ons--storage457300675--input798141440-.out |  2 +-
 ...ons--storage581876226--input166122047-.out |  2 +-
 ...ons--storage793461282--input781487591-.out |  2 +-
 ...all--storage921624073--input315650912-.out |  2 +-
 ..._all--storage921624073--input51111414-.out |  2 +-
 ...all--storage921624073--input545734274-.out |  2 +-
 ...all--storage921624073--input772794967-.out |  2 +-
 ...all--storage921624073--input917967660-.out |  2 +-
 ...all--storage921624073--input964818218-.out |  2 +-
 ...act--storage125992234--input117475800-.out |  2 +-
 ...act--storage921624073--input125992234-.out |  2 +-
 ...ps--storage492856247--input1011138251-.out |  2 +-
 ...ps--storage492856247--input1018564342-.out |  2 +-
 ...ps--storage492856247--input1031049988-.out |  2 +-
 ...mps--storage492856247--input685590443-.out |  2 +-
 ..._eq--storage125992234--input246866101-.out |  2 +-
 ...g_eq--storage125992234--input26856104-.out |  2 +-
 ...ign--storage680650890--input529388602-.out |  2 +-
 ...ip--storage1011138251--input590117173-.out |  2 +-
 ...ip--storage1011138251--input850887554-.out |  2 +-
 ...ipn--storage680650890--input529388602-.out |  2 +-
 ...opn--storage680650890--input529388602-.out |  2 +-
 ...ugn--storage680650890--input529388602-.out |  2 +-
 ...p-n--storage125992234--input125992234-.out |  2 +-
 ...div--storage994417987--input247451205-.out |  2 +-
 ...div--storage994417987--input250545589-.out |  2 +-
 ...ediv--storage994417987--input79625541-.out |  2 +-
 ...tez--storage977883604--input147133089-.out |  2 +-
 ...tez--storage977883604--input215785357-.out |  2 +-
 ...tez--storage977883604--input389351431-.out |  2 +-
 ...utez--storage977883604--input44513000-.out |  2 +-
 ...tez--storage977883604--input635398196-.out |  2 +-
 ...tez--storage977883604--input734264738-.out |  2 +-
 ...tez--storage977883604--input993071382-.out |  2 +-
 ...mit--storage125992234--input125992234-.out |  2 +-
 ...map--storage457300675--input125992234-.out |  2 +-
 ...cat--storage398998998--input246262487-.out |  2 +-
 ...ncat--storage398998998--input79230375-.out |  2 +-
 ...rst--storage492856247--input478406404-.out |  2 +-
 ...rst--storage492856247--input962874972-.out |  2 +-
 ...ap--storage1026405794--input329240220-.out |  2 +-
 ...map--storage382368661--input329240220-.out |  2 +-
 ...map--storage496578814--input329240220-.out |  2 +-
 ...map--storage496578814--input507231566-.out |  2 +-
 ...map--storage547821324--input329240220-.out |  2 +-
 ...map--storage796012494--input156280093-.out |  2 +-
 ...map--storage796012494--input228164856-.out |  2 +-
 ...lue--storage139236239--input329240220-.out |  2 +-
 ...alue--storage139236239--input79230375-.out |  2 +-
 ...lue--storage329396864--input156280093-.out |  2 +-
 ...ey--storage921624073--input1040351577-.out |  2 +-
 ...key--storage921624073--input153350004-.out |  2 +-
 ...tring--storage151303925--input3431716-.out |  2 +-
 ...ing--storage151303925--input535018041-.out |  2 +-
 ...-if--storage921624073--input570553153-.out |  2 +-
 ...-if--storage921624073--input954397288-.out |  2 +-
 ...ome--storage398998998--input288201633-.out |  2 +-
 ...ome--storage398998998--input921624073-.out |  2 +-
 ...int--storage921624073--input453441034-.out |  2 +-
 ...int--storage921624073--input535454136-.out |  2 +-
 ...int--storage921624073--input680650890-.out |  2 +-
 ...ak--storage921624073--input1008262038-.out |  2 +-
 ...right--storage4177631--input202098045-.out |  2 +-
 ..._right--storage4177631--input44576556-.out |  2 +-
 ...vel--storage492856247--input125992234-.out |  2 +-
 ...cat--storage717096222--input457300675-.out |  2 +-
 ...cat--storage717096222--input546523343-.out |  2 +-
 ...tes--storage149262694--input220724351-.out |  2 +-
 ...tes--storage149262694--input457300675-.out |  2 +-
 ...ytes--storage65410082--input457300675-.out |  2 +-
 ...tes--storage726220441--input972761363-.out |  2 +-
 ..._id--storage528921618--input264787654-.out |  2 +-
 ..._id--storage528921618--input457300675-.out |  2 +-
 ..._id--storage528921618--input656499821-.out |  2 +-
 ...map--storage528921618--input264787654-.out |  2 +-
 ...map--storage528921618--input457300675-.out |  2 +-
 ...map--storage528921618--input656499821-.out |  2 +-
 ...ter--storage680650890--input568817463-.out |  2 +-
 ...ter--storage680650890--input737923774-.out |  2 +-
 ...ock--storage907453363--input457300675-.out |  2 +-
 ...ock--storage907453363--input648737279-.out |  2 +-
 ...ock--storage907453363--input908379154-.out |  2 +-
 ...ize--storage492856247--input403499055-.out |  2 +-
 ...ize--storage492856247--input457300675-.out |  2 +-
 ...ize--storage492856247--input469078912-.out |  2 +-
 ...ize--storage492856247--input802622031-.out |  2 +-
 ...eft--storage528921618--input457300675-.out |  2 +-
 ...eft--storage528921618--input851203613-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 ...id--storage457300675--input1027566226-.out |  2 +-
 ..._id--storage457300675--input276660554-.out |  2 +-
 ..._id--storage457300675--input599923743-.out |  2 +-
 ...er--storage1011138251--input403579222-.out |  2 +-
 ...er--storage1011138251--input532072758-.out |  2 +-
 ...map--storage457300675--input798141440-.out |  2 +-
 ...map--storage794999348--input152441147-.out |  2 +-
 ..._map--storage88008216--input798141440-.out |  2 +-
 ...nat--storage495706788--input453441034-.out |  2 +-
 ..._nat--storage56274299--input453441034-.out |  2 +-
 ..._nat--storage56274299--input564400327-.out |  2 +-
 ..._nat--storage56274299--input654274102-.out |  2 +-
 ...nat--storage690637660--input453441034-.out |  2 +-
 ...nat--storage806237530--input453441034-.out |  2 +-
 ...ng--storage109689253--input1071610051-.out |  2 +-
 ...ing--storage109689253--input700475845-.out |  2 +-
 ...ing--storage109689253--input905318451-.out |  2 +-
 ...ing--storage495706788--input700475845-.out |  2 +-
 ...ing--storage915708427--input700475845-.out |  2 +-
 ...ing--storage936682951--input905318451-.out |  2 +-
 ...size--storage492856247--input15265129-.out |  2 +-
 ...ize--storage492856247--input158311065-.out |  2 +-
 ...ize--storage492856247--input456982702-.out |  2 +-
 ...ize--storage492856247--input457300675-.out |  2 +-
 ...mul--storage125992234--input125992234-.out |  2 +-
 ..._fr--storage151303925--input216277421-.out |  2 +-
 ..._fr--storage287799761--input485842614-.out |  2 +-
 ...eg--storage680650890--input1067298059-.out |  2 +-
 ...neg--storage680650890--input380029349-.out |  2 +-
 ...neg--storage680650890--input563503226-.out |  2 +-
 ...neg--storage680650890--input788662499-.out |  2 +-
 ...neg--storage680650890--input972832189-.out |  2 +-
 ...none--storage11179311--input125992234-.out |  2 +-
 ...not--storage921624073--input570553153-.out |  2 +-
 ...not--storage921624073--input954397288-.out |  2 +-
 ...ry--storage921624073--input1051197453-.out |  2 +-
 ...ary--storage921624073--input123939249-.out |  2 +-
 ...nary--storage921624073--input24243730-.out |  2 +-
 ...ary--storage921624073--input518945720-.out |  2 +-
 ...ary--storage921624073--input788662499-.out |  2 +-
 ...ary--storage921624073--input906118781-.out |  2 +-
 ...ary--storage921624073--input921874253-.out |  2 +-
 ...ary--storage921624073--input972832189-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 ...-or--storage921624073--input106930123-.out |  2 +-
 ...-or--storage921624073--input181204719-.out |  2 +-
 ...-or--storage921624073--input223774825-.out |  2 +-
 ...-or--storage921624073--input908807505-.out |  2 +-
 ...ry--storage921624073--input1056991424-.out |  2 +-
 ...ary--storage921624073--input375993021-.out |  2 +-
 ...ary--storage921624073--input673240563-.out |  2 +-
 ...ary--storage921624073--input747448890-.out |  2 +-
 ...ary--storage921624073--input832403787-.out |  2 +-
 ...ary--storage921624073--input858098961-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 ...rev--storage125992234--input305844558-.out |  2 +-
 ...rev--storage125992234--input646365167-.out |  2 +-
 ...ty--storage125992234--input1028781121-.out |  2 +-
 ...cty--storage125992234--input802670583-.out |  2 +-
 ..._id--storage921624073--input106930123-.out |  2 +-
 ..._id--storage921624073--input181204719-.out |  2 +-
 ..._id--storage921624073--input223774825-.out |  2 +-
 ..._id--storage921624073--input908807505-.out |  2 +-
 ...ec--storage256947135--input1050356042-.out |  2 +-
 ...c_2--storage197120858--input179371027-.out |  2 +-
 ...int--storage921624073--input125992234-.out |  2 +-
 ...rse--storage528921618--input457300675-.out |  2 +-
 ...rse--storage528921618--input851203613-.out |  2 +-
 ...oop--storage528921618--input457300675-.out |  2 +-
 ...oop--storage528921618--input851203613-.out |  2 +-
 ...ate--storage457300675--input125992234-.out |  2 +-
 ...ess--storage125992234--input125992234-.out |  2 +-
 ...int--storage125992234--input125992234-.out |  2 +-
 ...int--storage125992234--input289072903-.out |  2 +-
 ...car--storage224747103--input620760059-.out |  2 +-
 ...car--storage224747103--input717096222-.out |  2 +-
 ..._car--storage224747103--input79230375-.out |  2 +-
 ...cdr--storage205576101--input654274102-.out |  2 +-
 ...cdr--storage224747103--input453441034-.out |  2 +-
 ...cdr--storage611418174--input967284912-.out |  2 +-
 ..._id--storage457300675--input264787654-.out |  2 +-
 ..._id--storage457300675--input457300675-.out |  2 +-
 ..._id--storage457300675--input989507347-.out |  2 +-
 ...ter--storage492856247--input457300675-.out |  2 +-
 ...ter--storage492856247--input701684511-.out |  2 +-
 ...ter--storage492856247--input802622031-.out |  2 +-
 ...mber--storage495706788--input33757838-.out |  2 +-
 ...mber--storage550087893--input79230375-.out |  2 +-
 ...mber--storage605111220--input33757838-.out |  2 +-
 ...ize--storage492856247--input403499055-.out |  2 +-
 ...ize--storage492856247--input457300675-.out |  2 +-
 ...ize--storage492856247--input469078912-.out |  2 +-
 ...ize--storage492856247--input802622031-.out |  2 +-
 ...a3--storage921624073--input1008262038-.out |  2 +-
 ...fts--storage921624073--input115382786-.out |  2 +-
 ...fts--storage921624073--input271566295-.out |  2 +-
 ...fts--storage921624073--input340971987-.out |  2 +-
 ...fts--storage921624073--input374168553-.out |  2 +-
 ...fts--storage921624073--input413621582-.out |  2 +-
 ...fts--storage921624073--input424849461-.out |  2 +-
 ...fts--storage921624073--input485030042-.out |  2 +-
 ...fts--storage921624073--input705767726-.out |  2 +-
 ...fts--storage921624073--input769385932-.out |  2 +-
 ...fts--storage921624073--input913715337-.out |  2 +-
 ...lice--storage351480851--input65907686-.out |  2 +-
 ...ice--storage364922380--input198821575-.out |  2 +-
 ...ice--storage364922380--input359592843-.out |  2 +-
 ...ice--storage364922380--input551316239-.out |  2 +-
 ...ice--storage364922380--input722749044-.out |  2 +-
 ...ice--storage364922380--input839234860-.out |  2 +-
 ...ice--storage364922380--input919180079-.out |  2 +-
 ...ice--storage921624073--input551316239-.out |  2 +-
 ...tes--storage229749865--input198821575-.out |  2 +-
 ...tes--storage229749865--input462551352-.out |  2 +-
 ...tes--storage229749865--input489157380-.out |  2 +-
 ...tes--storage229749865--input551316239-.out |  2 +-
 ...tes--storage229749865--input669330759-.out |  2 +-
 ...tes--storage229749865--input743596105-.out |  2 +-
 ...tes--storage229749865--input839234860-.out |  2 +-
 ...ytes--storage504917929--input65907686-.out |  2 +-
 ...tes--storage921624073--input462551352-.out |  2 +-
 ...id--storage921624073--input1016369050-.out |  2 +-
 ...r_id--storage921624073--input93477117-.out |  2 +-
 ...lta--storage492856247--input249636002-.out |  2 +-
 ...lta--storage492856247--input307538219-.out |  2 +-
 ...lta--storage492856247--input831449542-.out |  2 +-
 ...sub--storage921624073--input706350605-.out |  2 +-
 ...sub--storage921624073--input856198194-.out |  2 +-
 ...omb--storage680650890--input394061083-.out |  2 +-
 ...air--storage125992234--input125992234-.out |  2 +-
 ...r--storage1011138251--input1040351577-.out |  2 +-
 ...or--storage921624073--input1058477720-.out |  2 +-
 ...or--storage921624073--input1073176155-.out |  2 +-
 ...xor--storage921624073--input246594902-.out |  2 +-
 ...xor--storage921624073--input506603577-.out |  2 +-
 ...xor--storage921624073--input576248088-.out |  2 +-
 ...xor--storage921624073--input612012282-.out |  2 +-
 ...xor--storage921624073--input617591686-.out |  2 +-
 ...xor--storage921624073--input639311176-.out |  2 +-
 ...xor--storage921624073--input688315180-.out |  2 +-
 ...xor--storage921624073--input967929605-.out |  2 +-
 ...tes--storage125992234--input125992234-.out |  2 +-
 .../Oxford- Tc scripts.out                    |  2 +-
 344 files changed, 424 insertions(+), 424 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index ec77a41aa94b..5497c2f127f9 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 717055224855..773296e3f9b2 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 2324a3fccd31..65e892c00767 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 2f0be24d75ea..22503428f65a 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 071340309d5a..22daefede491 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/tezt/lib_tezos/protocol.ml b/tezt/lib_tezos/protocol.ml
index 5c853655da34..f395244daca4 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 3599bccbf674..20945fe0efd3 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 fee74a9e3f9d..58dc3c0a595f 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 53c1a89fb1e5..1ea3f87f507c 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 de8c76ee1137..16fbfc837a11 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 88ad5414b55e..24f3a802c673 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 f44709fc77f1..90f8e510dc45 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 4c7915579940..cec876d13f7b 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 4f0bbc753d4f..b52b32638142 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 1f6062cbf60d..5b078836f2da 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 0e37d1d1d181..dacc303fdde3 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 3f2751d5e27f..7abd4a5ad39b 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 da5daf1d83bb..72ac97156f03 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 9e8d02286a0b..57a7010ce526 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 ea982557b240..85985793db98 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 fea7df26e77b..feb1859b912b 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 a62409767ac6..e9f0380c14ff 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 070962430c4d..d60f01e1a835 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 e17bc7009eb9..154e9daa856b 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 9ad1dc1455ec..6f3b0237b6d1 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 4c0782f2f82e..47efd9f7ee4d 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 5e1a711bdd3c..c27d32f8911b 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 558fb3d7f444..e14fbecb6b0d 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 c4084d7c4ba7..ec1e1c547d97 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 8865946c46bd..d4b2f34e80cd 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 6d6d85cc21b7..fb91f00ca478 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 72b26f8c603b..58d8f041b979 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 cfb23fb5436f..629f1aeab2ad 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 6813a13ee728..f6800fca7c36 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 4ed0f187b669..414afff68aad 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 38fee7550311..d5a3ec818f3f 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 3a4364d57107..fde9b4e6ac31 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 37d9ab109b6d..a0b63d1d8110 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 7c895d6779f9..354048a91209 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 9ed454eee197..818cd09ce3fb 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 3b29a9df0447..00ed1080ddd2 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 1a575c3ded25..d843f7e7ea0f 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 ec1f9a90de09..393fc401444b 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 772be29ce8b5..05b327443c49 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 8a5f513ae842..a4aacee9c8e5 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 373f0a6f9179..f9e7eaa91e60 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 833045db85c5..eea5b9713c13 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 d3b60a7125d2..f5d3c589ce16 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 d17b511fef8b..a64230761ab5 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 5f87f5b5eb3b..5b8e0773e46c 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 65de0622f31c..afcb78acdf32 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 e7a6b5a5d868..0e7271c05a6b 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 7caac778f6be..b05dafa5e6b8 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 8a642f44eab6..800d777316c9 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 147162274928..e63d1f260d93 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 ca7c77a5cdfb..1965cfed40f7 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 ba2d2178f993..74c342a93493 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 0d5cd4e84195..9108ba3f076f 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 7a42764dccd1..a8b50017974a 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 6258715bb948..2a225e004139 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 5e64f78f2c76..c901bf45005c 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 c5861fa059a2..a9a8f7379aeb 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 7beeb9cd9f1f..10812636c8eb 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 cc572454cbaa..3bb9281a1264 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 d315f72d5672..5c9245a9c0d4 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 16e4f404a241..6496c9e03c35 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 6f10762ac23a..d9424aa5f4be 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 e83b0f2685bd..197987260560 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 13463d369663..8a0cab94d851 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 6710e3a09e47..84d31e168ab1 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 94ee8407268d..ccda8c6d9caa 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 5b3dc095d226..21a602018537 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 2946b92443fc..11bdec2845e2 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 bf0e2d9b8ebd..b627af6f4339 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 9aab2d777fe2..908a0c296d52 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 4757f7c0b1cf..961a101ea19f 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 324281d25ffc..13feb9dd808a 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 9378dd2e63af..b88788080889 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 59628b1ce8fa..fc770eec398d 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 c15a03bb6395..f07aed01dbc4 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 12b73f3544a0..6275c71d6ca6 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 57f398b3d554..e3eec8e922d6 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 4e1e147293bd..10ff3bd1b336 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 38add62701a3..1fc30a5ed056 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 d75d623844a3..bead8029eb11 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 35bc30e3343b..2b69a5b80870 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 008c2d03ecf8..1ed6f98f85fc 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 af6e46386d1c..0611d223ca5e 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 8b44cb932a3d..f10f8a0c24a9 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 d7a567a371dc..bc12dbb7173f 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 5e17ea545ea3..71ffb6de1d5c 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 e35209b17681..ae226316e056 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 215fc2fe8080..d73c09ab9dbf 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 020520a313d1..43176db41b1b 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 dc8de99733f9..9f71d2fc33ce 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 c1441ac9ef32..688c47102d0c 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 28512b51aa3a..b6da08c7c593 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 f0e11dc08819..e9b7381f37b8 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 09da46ca3dac..a36f96c13a2d 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 c23fcf02fb6c..079f30a3a505 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 8cc35ef9ed6e..a2db945992e6 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 5edf1be74ff3..eecad871af65 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 1085dc4a9475..7a9eef4c5909 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 27de846c4c92..46aeccfc36a0 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 048472b5569a..a6e3d9217d14 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 9ae0b629182e..68643fa0ed45 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 de87766ca1b8..85b705f3e287 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 70c37113c96c..0d21dedd9d7b 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 d3bcb53da440..09519ca41bd2 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 b05dbbb234f7..499456873f67 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 52e7862f7da1..4cfc3a0d650a 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 4e5d62a5121f..1dcfd555042e 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 ac5a147c3063..b90c4bb7ff1f 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 8f9c6003afc9..54fc15a53167 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 ec35a4491448..b24708d5522c 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 e784824f81a4..baec55eeadba 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 6f50e94c81a0..be81c6668b47 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 9d659a1dbd45..db83ec539dbb 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 e5b36f2ed8d6..e27ec245218e 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 9f2ba394a0fa..b0ecc63d6e00 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 13847e62ba07..5829376bbe4b 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 f4c9b7aba826..4ae56272e117 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 3b0756ff93d6..6e937e48be95 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 33937118aa05..40e3b54ad77a 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 0685c31ab47d..5d5844e4f71a 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 e5898b1a514d..da5e8f6281d6 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 26010d90ca82..0831b316587b 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 9d54d39f7cce..186f1a22d212 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 1afde81481a0..6e4c13843d4d 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 7e27121f33eb..9bb771918ec8 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 f898096d9c22..218fc16394a6 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 f74f1849e647..77727790b0ec 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 4763bbc991bb..d0b21cbb5ab9 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 4e48f4e52a88..2913c9814c01 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 fcfe0a54f3ae..f52c1470adf0 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 d567738496c9..9a0b208fadb6 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 fc9600dbb905..c5531fca608c 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 bb566a797652..8eac04005757 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 ca74d3b8dfa1..e37879f49709 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 afa724f0eed3..073f202b4fe1 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 a0d8a4d70fda..9bd555862d94 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 43d6d756dd44..bf2033ba5793 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 288960907f9a..e59f5d036432 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 f04a1984ac8c..110653e1d728 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 bbcbb363be0b..985099844cbe 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 bb2e56fc488e..c47927e15575 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 4ea2878cfc7d..31b64a93f669 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 42b4fde958ff..13f170600bfc 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 7fbb0fbb144c..4b3277a4c319 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 02a5b5a19434..95f586e40b0d 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 925af688caee..4178a18350fa 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 03cbcf2c829e..654f03cc0a61 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 b985a6a8f79b..5e10f1600195 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 fbe1648f6378..728512c2080b 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 05632fc50c44..88c05ef2b928 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 0db762ada631..00f1100daff9 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 f417b7827643..3e3530c49494 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 2a9f5a31a3cb..d3871371baef 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 076932d51d44..86c56e1c9d20 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 530dcdd100ce..5f49938739a5 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 168475cf13c7..e64a39c9ac2b 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 af9287649fa9..0818c10aeaf9 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 5989a4f32d72..81a912857742 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 4339c7ed4e9b..af62877421b0 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 ece6fb780c34..925b255ed47e 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 8e40d1728e8e..2135ceb8db2d 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 48a27c22a1dc..229a29c38454 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 095ba6b9927a..8bdff3fbd976 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 89d3bb404fe4..7c00b2f9f200 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 138ba13cd037..6bd98a81b82b 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 35d95892bd26..3cb48b1f98ea 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 fc67b93242fa..e71d5bd6abb5 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 2a901a116344..0e61053571d9 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 a1b8ffc0995c..3ab3c7ce5223 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 d43071e54580..4df435e21845 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 fb755c8cc7a1..2ecb24badf65 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 e35e6e290c2e..df6fa4a71ac2 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 93fdaefc6936..7d76ac653132 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 8f2963ed6b58..5d7be45110ed 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 5e1dd87d65b3..2eff7ae72161 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 33a63acb11bd..5eb8f9d34a13 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 c6f5711d050f..8ea07d8301a6 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 f7570462da80..757bb51ae0b6 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 fe24de48829b..66c340663d0f 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 c1a5ab686f98..8324aa6f514f 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 49c7a0e9584d..ca092f0ff7e7 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 73f83f2a06a2..913a3e703be0 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 95faab554a26..636fcaa7d7b8 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 1706b8d8b51d..b2a8bda12810 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 de012026777e..de2e78c63165 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 1bad1ca4f7ae..b7f84cf67f71 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 b8a79f0a0816..420c3b26de83 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 1d4f307d8d07..b227ec7cce36 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 f60cd4b0293c..d79aed590b5b 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 5cbb6b98b7f3..f3f90eac5af6 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 86656b393307..3a5fac10b238 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 4b85ef057aa1..7314320608ac 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 14e24eaf6536..43c85b6b4079 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 dbd4bbc0447c..d9437d4afb78 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 1ed7b532e207..3565913a75ee 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 f65d5a18c21a..2f7b864d7cf1 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 d5d5e71f0a8b..6f32bf6d4143 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 b2c69cabc33e..e3cc9d4acc37 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 8d673a5b6c71..2b5207c6dfb9 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 5a4066b76b15..6ae38c63cc7e 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 4f759ed18c02..869877738598 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 59d57aad41de..ca0a56ae80b8 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 ad2a5caa2cbe..31bb48741e8c 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 e77d4f694a06..338c772f54c6 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 5e993456f4ea..b562cc5e3991 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 059be9e0909e..11e74e41c820 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 937a93e7d263..e8753396b1d9 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 36f6a39bf38d..1252eafe6ff7 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 9408c56fb666..f53891c1472a 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 db51a93d96c6..8e4ff85669c1 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 ef098bd5b4c1..dacff153e86b 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 25d96fdd3776..d5f38286b785 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 fe029dd27236..c166ed250fa1 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 fd368d094b32..23ecc624a8ec 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 60eb86613b91..8c5d6a163e25 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 1eb2550c3f12..008311f0849d 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 f7605988a3f9..c0d672e36c09 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 f4c914c18fc1..8ca711fa7386 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 7d5639cd2001..3fea4eb9ad2e 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 807c06d85575..dbe4cbef1fa3 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 84b5bd7d3eca..2e3ebe3b808d 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 953fd81a7103..56b085b76fc7 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 b4c10148e036..d960984dac29 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 8fad1b9be052..8a21378aba74 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 9dbd7df7f869..cca6918b7f4d 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 ed82c4175df4..653aef1f19a4 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 28772dafb638..24becd47d216 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 0416d0cf8b23..3541183dbd98 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 c5bcdf132040..5be7144fa55d 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 d10b3ad81aab..a17263475df7 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 d5aea82c7c42..63fc49a7b376 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 b869a5ecb2a7..e3e7fe454a3c 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 f16da267f93b..597d7868018a 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 732c96e4c5ab..70bca1c6d35a 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 87130adcf12e..4dd9a451a144 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 6b1a78ec8772..28720f9da832 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 46330024fe7b..073db0698de1 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 bef4f625f7a5..4f78c9e94a56 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 0b5880d403be..e25c452b39f0 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 ecab528e6a4c..5d4faf728323 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 8f8de0cc2a09..6a1fd163ff95 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 f70b227a5a78..c46f9158813f 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 d120f0e6c11b..8404cf6fb9b6 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 cac5edc2a30d..e1d4b89bf41d 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 0193ee6ff098..5f4b3d801780 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 8bd9cc093dec..6f99dfdf91ee 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 0f751aad47a6..9b619b0c2684 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 b1eb563fa0b2..ae6d6c8623c1 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 d2c25e096e79..5b5418dc4e4b 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 21f51a6f3621..8ba3bb29f530 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 0e190959d9d5..019eee8321c6 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 e7e82a18f0d4..7fef309dcb8c 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 a90b5db57717..6135ce48ba57 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 5f629b1f7502..edec7b4cc6d7 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 febe87087373..6bd39b802db1 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 3839c2d1293e..30a763ddcf14 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 f2a606735d50..eb0fb3ceba6c 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 b05b8e62ebe1..cf05cb005672 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 eda34f9fd48d..b0bc7a5f1108 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 8ef94fa9f57a..2ebc6831f2d1 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 14670018a9ff..f896c53aaeec 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 2d7d6bb39857..860a1516eb62 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 343481dde935..1933c8b66e27 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 febbe336c704..a7fc79354452 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 bce36377a878..8fc5d2787c04 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 e535936b1d5e..1db42d71b035 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 eee0a8a229ff..5a4b6483ff9e 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 64c5aa5f66dc..9707ad2be6dc 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 dac38e68fc9f..845df9b3dc0c 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 4afd6db0dd6b..236a6e84c3c1 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 93a4b0dc5916..29f6ab43c913 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 46f92ad77069..93213b0ea7cc 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 5ebac6540e37..ca7c483aa957 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 1ec4a455f52b..030a369bdc8d 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 27c744d37710..070bd9cad0eb 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 ea386707ca69..3d3c63afdf58 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 364c8c8dd014..666987a4c685 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 ed3c997eac5a..8eb77910f554 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 2f3632286d68..150862981520 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 12ceeefcd417..64f322fd3140 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 b69aeb22afbb..c820d2a95c0c 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 27c4497b22dd..e9a2a2f2f9a6 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 065ab0255444..3704fc9a4c70 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 178c4dd91bce..5371d4f53c11 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 986016b3f0c3..f8306bcdfb0e 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 b5024a124a5e..77b23b6d6963 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 32fa4991e5f4..337c961a71f2 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 a8810dded5a3..95e66dadecf8 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 d731a1dd380a..712d4013e779 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 59a745556343..8ecdb164ba74 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 c1cf0c19b355..db685bdc2200 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 a5150d723fab..049a72e664f3 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 47ebe2cb6cb6..a5a5d7de5577 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 ca8bf2773327..a8d3a1f6e2f4 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 b7ce0e7c3e3e..36b1bd7e0c38 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 694ea5b8a119..9fbd7d70fad1 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 d8d67ed7e138..1609afa43a33 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 cd58a013a291..450f48171af6 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 de38babdf6b2..55792fba128c 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 6d83aad83c65..c8330d217ce4 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 5aff0c48ba21..4d5c70ca578a 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 5bfe752b5ba2..db9a210e0c99 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 76618bde6447..5bff459b5d39 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 b5d958fdda0b..03ddbab70484 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 585c1f54bbcb..1c2885704f20 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 6b342c004308..8eacbcbe5dfb 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 cc317d4e88e2..1b66a98bac2e 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 33ac2395a53c..56f499bbd864 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 9c091792ba41..8ea69e8a1420 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 358f1a7a6ed7..ee296979fcb2 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 ed8fc5fb7054..9586afae6678 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 19f23bc7a1f4..0a5daf42e0e8 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 a59e5392e904..71ec00cefd77 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 2643ba05110d..63ddfae39508 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 3eaada6c50c3..1c7205493eb3 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 1ffb068db033..3c02ec41350a 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 8ae4d631beac..d1d02a4896e7 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 83a9205ea47a..5c9c4d993658 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 f3ba13d5d4a2..ece6058ab0fb 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 62a5c7f8a8ab..1dbabc50bf2a 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 5224b7e058eb..966fa3205d31 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 7c4789e73632..796b5751edff 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 cceb9615f716..466089ce5352 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 f3784c16af7d..22b57cf9144f 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 3fa7a85e4483..3c23d8604b16 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 caaf4eb241fb..abec57bf1039 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 defa811315fa..3fc7062d6ed7 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 4f1c41e8df2e..f7759cf3869e 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 14a055d78a35..de844adc71b9 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 e0c66dffa09d..f8c4e16977c6 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 8dffae1ac341..403d5e927963 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 da596b302767..e19455988033 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 05783d14d3ff..89989a3bf036 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 f85e17884051..7c59e0298be8 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 26e2a2e65bc2..65455d293452 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 58fb9ac42a5d..068d680c0e82 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 b8e99098e6b7..5838448819f2 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 0881ab84cdcf..253aef99f95f 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 4c62e05ce7ea..e2fd48b23098 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)
-- 
GitLab


From 8b2fb45980bd3a743060aa43fd952990c9ff4b17 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Mon, 4 Dec 2023 18:06:58 +0100
Subject: [PATCH 2/2] Oxford: Update protocol code

---
 src/proto_018_Proxford/lib_protocol/init_storage.ml | 3 ---
 src/proto_018_Proxford/lib_protocol/main.ml         | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/proto_018_Proxford/lib_protocol/init_storage.ml b/src/proto_018_Proxford/lib_protocol/init_storage.ml
index db8ffa047a8a..4d21ac9cd4ea 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 1be54a4fa9d5..d4315f2f3ce6 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 *)
-- 
GitLab