From 5e6f608a111c643f414d7fee0985ae05e9c162ad Mon Sep 17 00:00:00 2001 From: Antonio Locascio Date: Wed, 16 Nov 2022 08:45:44 +0100 Subject: [PATCH 1/2] Proto/ZKRU: rename zkr1 to epx1 --- .../lib_protocol/test/helpers/dummy_zk_rollup.ml | 6 ++++-- .../lib_protocol/test/unit/test_destination_repr.ml | 6 +++--- src/proto_alpha/lib_protocol/zk_rollup_repr.ml | 4 ++-- src/proto_alpha/lib_protocol/zk_rollup_repr.mli | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml b/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml index 0bcd057ff003..e6eb55c04cb9 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml @@ -384,8 +384,10 @@ end = struct Hex.to_bytes_exn (`Hex "0002298c03ed7d454a101eb7022bc95f7e5f41ac78") let dummy_rollup_id = - (* zkr1PxS4vgvBsf6XVHRSB7UJKcrTWee8Dp7Wx *) - Hex.to_bytes_exn (`Hex "c9a524d4db6514471775c380231afc10f2ef6ba3") + let address = + Zk_rollup.Address.of_b58check_exn "epx18RJJqrYuJQqhB636BWvukU3XBNQGbtm8C" + in + Data_encoding.Binary.to_bytes_exn Zk_rollup.Address.encoding address let dummy_ticket_hash = Bytes.make 32 '0' diff --git a/src/proto_alpha/lib_protocol/test/unit/test_destination_repr.ml b/src/proto_alpha/lib_protocol/test/unit/test_destination_repr.ml index 07cf5adbc3df..f87ae0011b00 100644 --- a/src/proto_alpha/lib_protocol/test/unit/test_destination_repr.ml +++ b/src/proto_alpha/lib_protocol/test/unit/test_destination_repr.ml @@ -83,7 +83,7 @@ let sc_rollup_address = "scr1HLXM32GacPNDrhHDLAssZG88eWqCUbyLF" (* TODO: https://gitlab.com/tezos/tezos/-/issues/3731 Explain how this address was computed *) -let zk_rollup_address = "zkr1RePaz42fAmoGVGPhRvoVH5zwr3Sz6ZS93" +let zk_rollup_address = "epx18RJJqrYuJQqhB636BWvukU3XBNQGbtm8C" let assert_compat contract destination = match destination with @@ -184,13 +184,13 @@ let test_compare_destination () = let kt1 = !!(Destination_repr.of_b58check liquidity_baking_dex) in let txr1 = !!(Destination_repr.of_b58check tx_rollup_address) in let scr1 = !!(Destination_repr.of_b58check sc_rollup_address) in - let zkr1 = !!(Destination_repr.of_b58check zk_rollup_address) in + let epx1 = !!(Destination_repr.of_b58check zk_rollup_address) in assert (Destination_repr.(tz1 < kt1)) ; assert (Destination_repr.(kt1 < txr1)) ; assert (Destination_repr.(tz1 < txr1)) ; assert (Destination_repr.(txr1 < scr1)) ; - assert (Destination_repr.(scr1 < zkr1)) ; + assert (Destination_repr.(scr1 < epx1)) ; return_unit diff --git a/src/proto_alpha/lib_protocol/zk_rollup_repr.ml b/src/proto_alpha/lib_protocol/zk_rollup_repr.ml index 2bcb5a871118..52fe03aa9b9a 100644 --- a/src/proto_alpha/lib_protocol/zk_rollup_repr.ml +++ b/src/proto_alpha/lib_protocol/zk_rollup_repr.ml @@ -24,11 +24,11 @@ (*****************************************************************************) module Address = struct - let prefix = "zkr1" + let prefix = "epx1" let encoded_size = 37 - let decoded_prefix = "\001\171\084\251" + let decoded_prefix = "\001\023\224\125" module H = Blake2B.Make diff --git a/src/proto_alpha/lib_protocol/zk_rollup_repr.mli b/src/proto_alpha/lib_protocol/zk_rollup_repr.mli index 52c028b4af22..d36a047fc21f 100644 --- a/src/proto_alpha/lib_protocol/zk_rollup_repr.mli +++ b/src/proto_alpha/lib_protocol/zk_rollup_repr.mli @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -(** A ZK rollup has an address starting with "zkr1". +(** A ZK rollup has an address starting with "epx1". ZKRU addresses have a length of 20 bytes, which means that they have an injective encoding as BLS12-381 scalars. *) -- GitLab From 44804755f9faac9861d8b7e10f0d9e0301afad08 Mon Sep 17 00:00:00 2001 From: Antonio Locascio Date: Wed, 16 Nov 2022 09:44:54 +0100 Subject: [PATCH 2/2] Proto/Client: rename ZKRU to Epoxy in operation result pp --- src/proto_alpha/lib_client/operation_result.ml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 926c321eed5b..b01b092f19f5 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -405,11 +405,11 @@ let pp_manager_operation_content (type kind) source ppf Dal.Slot.Header.pp slot_header | Zk_rollup_origination _ -> - Format.fprintf ppf "Zk rollup origination:@,From: %a" Contract.pp source + Format.fprintf ppf "Epoxy origination:@,From: %a" Contract.pp source | Zk_rollup_publish _ -> - Format.fprintf ppf "Zk rollup publish:@,From: %a" Contract.pp source + Format.fprintf ppf "Epoxy publish:@,From: %a" Contract.pp source | Zk_rollup_update _ -> - Format.fprintf ppf "Zk rollup update:@,From: %a" Contract.pp source + Format.fprintf ppf "Epoxy update:@,From: %a" Contract.pp source let pp_balance_updates ppf balance_updates = let open Receipt in @@ -888,9 +888,9 @@ let pp_manager_operation_contents_result ppf op_result = | Sc_rollup_recover_bond_result _ -> "smart contract bond retrieval" | Dal_publish_slot_header_result _ -> "data availability slot header publishing" - | Zk_rollup_origination_result _ -> "zk rollup originate" - | Zk_rollup_publish_result _ -> "zk rollup publish" - | Zk_rollup_update_result _ -> "zk rollup update" + | Zk_rollup_origination_result _ -> "epoxy originate" + | Zk_rollup_publish_result _ -> "epoxy publish" + | Zk_rollup_update_result _ -> "epoxy update" in let pp_manager_operation_contents_result (type kind) ppf (result : kind successful_manager_operation_result) = -- GitLab