diff --git a/.gitlab/ci/test/unit.yml b/.gitlab/ci/test/unit.yml index 51404471f89b837752c9100e2a99a2e47418af04..92cafefa5e82ebb4cdb3aebf4a897d11b3d8b05e 100644 --- a/.gitlab/ci/test/unit.yml +++ b/.gitlab/ci/test/unit.yml @@ -39,18 +39,18 @@ unit:011_PtHangz2: src/proto_011_PtHangz2/lib_client.test_proto src/proto_011_PtHangz2/lib_protocol.test_proto -unit:012_PsiThaCa: +unit:012_Psithaca: extends: - .unit_test_template_x86_64 - .template__coverage_files variables: MAKE_TARGETS: > - src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference.test_proto - src/proto_012_PsiThaCa/lib_benchmark.test_proto - src/proto_012_PsiThaCa/lib_client.test_proto - src/proto_012_PsiThaCa/lib_plugin.test_proto - src/proto_012_PsiThaCa/lib_protocol.test_proto - src/proto_012_PsiThaCa/lib_delegate.test_proto + src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference.test_proto + src/proto_012_Psithaca/lib_benchmark.test_proto + src/proto_012_Psithaca/lib_client.test_proto + src/proto_012_Psithaca/lib_plugin.test_proto + src/proto_012_Psithaca/lib_protocol.test_proto + src/proto_012_Psithaca/lib_delegate.test_proto unit:alpha: extends: diff --git a/active_protocol_versions b/active_protocol_versions index 29d757b285ec8614354920784ea5c576f7c9cc76..0745d5816b8ffc8c3efa110177299411f3e9a946 100644 --- a/active_protocol_versions +++ b/active_protocol_versions @@ -1,3 +1,3 @@ 011-PtHangz2 -012-PsiThaCa +012-Psithaca alpha diff --git a/docs/012/sapling.rst b/docs/012/sapling.rst index 86ee0e7da81a3df7ce6584470f4314bf6df5b310..80a8b02b6574d21f944a278952fea1d6741c0437 100644 --- a/docs/012/sapling.rst +++ b/docs/012/sapling.rst @@ -453,7 +453,7 @@ unshielding. # bake a block to include it. # { } represents an empty Sapling state. tezos-client originate contract shielded-tez transferring 0 from bootstrap1 \ - running src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract.tz \ + running src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract.tz \ --init '{ }' --burn-cap 3 & tezos-client bake for bootstrap1 diff --git a/docs/012/token_management.rst b/docs/012/token_management.rst index d65931f85ab0cadf1805db99a323c2357a717530..d105523c4dfeb5ee245029ed7ae6de2c1975f859 100644 --- a/docs/012/token_management.rst +++ b/docs/012/token_management.rst @@ -6,7 +6,7 @@ This page describes the reporting of tokens transfers in block metadata, as a se Overview ~~~~~~~~ -Minting, transferring or burning tokens is handled by the `Token `_ module. +Minting, transferring or burning tokens is handled by the `Token `_ module. The module provides functions (``Token.transfer`` and ``Token.transfer_n``) to transfer tokens from one, respectively from more accounts, to another account. Balance updates found in block metadata are generated by these functions as a trace of the token movements having taken place. diff --git a/docs/012/voting.rst b/docs/012/voting.rst index 5b5cdf9252d6276bc9bcd2da61c87bae19ac5209..3c4c4d47f418eb6611bec42a11fa80ac248cbd34 100644 --- a/docs/012/voting.rst +++ b/docs/012/voting.rst @@ -137,7 +137,7 @@ Note that Pass ballots do not count towards or against the super-majority; they still counts towards participation and quorum. More details can be found in the file -:src:`src/proto_012_PsiThaCa/lib_protocol/amendment.ml`. +:src:`src/proto_012_Psithaca/lib_protocol/amendment.ml`. The Hash and the Protocol @@ -235,7 +235,7 @@ above, the quorum is adaptive and that low participation would lower the quorum of the next vote. More details on the operations can be found in -:src:`src/proto_012_PsiThaCa/lib_protocol/operation_repr.ml`. +:src:`src/proto_012_Psithaca/lib_protocol/operation_repr.ml`. The binary format is described by ``tezos-client describe unsigned operation``. diff --git a/docs/Makefile b/docs/Makefile index 29d7de8010f5942e97bdd842bc0af13851554be1..b8707de2caa2df6a51e72ec04973601476bca5c3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -10,13 +10,13 @@ DOCERRORDIR = $(DOCGENDIR)/errors DOCRPCDIR = $(DOCGENDIR)/rpcs ALPHA_LONG = ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK -ITHACA_LONG = PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP +ITHACA_LONG = Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A HANGZHOU_LONG = PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx ACTIVE_LONG = $(HANGZHOU_LONG) ALPHA_SHORT = alpha HANGZHOU_SHORT = 011-PtHangz2 -ITHACA_SHORT = 012-PsiThaCa +ITHACA_SHORT = 012-Psithaca ACTIVE_SHORT = $(HANGZHOU_SHORT) SCRIPTSDIR = scripts diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 99184dd8f3f1ec5c8e668a890a0d064f4aa3f2d8..e94c340e943d310b1e072d5037ff6196b16faadf 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -8,7 +8,7 @@ tezos-protocol-updater ; TODO tezos/tezos#2170: adapt next line(s) tezos-embedded-protocol-011-PtHangz2 - tezos-embedded-protocol-012-PsiThaCa + tezos-embedded-protocol-012-Psithaca tezos-embedded-protocol-alpha data-encoding re) diff --git a/docs/doc_gen/rpc_doc.ml b/docs/doc_gen/rpc_doc.ml index 75c7b6a7daaaf60fafaa7153cebab919b9f606b3..c12c21dcba5de98665e015b6d13d914667e8f0a7 100644 --- a/docs/doc_gen/rpc_doc.ml +++ b/docs/doc_gen/rpc_doc.ml @@ -40,7 +40,7 @@ let protocols = ( "012", "012 Ithaca", Some "/include/rpc_introduction.rst.inc", - "PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP" ); + "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A" ); ] let pp_name ppf = function diff --git a/docs/protocols/012_ithaca.rst b/docs/protocols/012_ithaca.rst index b8e8aa22f20dfb82a58527b24adfe0ab6c0ba101..eb572724dec63b04d45b3e0a140fd373f74de86e 100644 --- a/docs/protocols/012_ithaca.rst +++ b/docs/protocols/012_ithaca.rst @@ -4,7 +4,7 @@ Protocol Ithaca This page contains all the relevant information for protocol Ithaca (see :ref:`naming_convention`). -The code can be found in the :src:`src/proto_012_PsiThaCa` directory of the +The code can be found in the :src:`src/proto_012_Psithaca` directory of the ``master`` branch of Tezos. This page documents the changes brought by protocol Ithaca with respect diff --git a/manifest/main.ml b/manifest/main.ml index 14d9d9f4682fad035446e7b846226f6ef954cbe6..487bda91576786e33fff75e3e2b752a860b9c475 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -584,7 +584,7 @@ end = struct let _011_PtHangz2 = active ~number:011 "PtHangz2" - let _012_PsiThaCa = active ~number:012 "PsiThaCa" + let _012_Psithaca = active ~number:012 "Psithaca" let alpha = active "alpha" diff --git a/sandbox.Makefile b/sandbox.Makefile index fd873a75c810ece6da7ed3e903380110c9c88f72..086a00b4e1494abe84bc41ec49a4e840f16214b5 100644 --- a/sandbox.Makefile +++ b/sandbox.Makefile @@ -3,8 +3,8 @@ TMP=/tmp CURRENT_PROTO=011-PtHangz2 CURRENT_PROTO_HASH=PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx CURRENT_PROTO_NAME=Hangzhou -NEXT_PROTO=012-PsiThaCa -NEXT_PROTO_HASH=PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP +NEXT_PROTO=012-Psithaca +NEXT_PROTO_HASH=Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A NEXT_PROTO_NAME=Ithaca ALPHA_PROTO=alpha ALPHA_PROTO_HASH=ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK diff --git a/scripts/yes-wallet/dune b/scripts/yes-wallet/dune index 3a059560d667373ad4504b35018e621f4ea94028..ad12a180a7f94ccded2b9368205ea51a4ae38ceb 100644 --- a/scripts/yes-wallet/dune +++ b/scripts/yes-wallet/dune @@ -13,7 +13,7 @@ tezos-protocol-009-PsFLoren tezos-protocol-010-PtGRANAD tezos-protocol-011-PtHangz2 - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-alpha) (modules yes_wallet_lib)) diff --git a/scripts/yes-wallet/yes_wallet_lib.ml b/scripts/yes-wallet/yes_wallet_lib.ml index da01d0888042f9d838cfa591ae20e06afca64cf8..210e4377c15132fe2a6302b90a599939105aa5ba 100644 --- a/scripts/yes-wallet/yes_wallet_lib.ml +++ b/scripts/yes-wallet/yes_wallet_lib.ml @@ -229,7 +229,7 @@ let get_delegates (proto : protocol) context (fun (_, _, x) (_, _, y) -> Alpha_context.Tez.compare y x) delegates | Ithaca -> - let open Tezos_protocol_012_PsiThaCa.Protocol in + let open Tezos_protocol_012_Psithaca.Protocol in Alpha_context.prepare context ~level ~predecessor_timestamp ~timestamp >|= Environment.wrap_tzresult >>=? fun (ctxt, _, _) -> @@ -301,7 +301,7 @@ let protocol_of_hash protocol_hash = Protocol_hash.equal protocol_hash Tezos_protocol_011_PtHangz2.Protocol.hash then Some Hangzhou else if - Protocol_hash.equal protocol_hash Tezos_protocol_012_PsiThaCa.Protocol.hash + Protocol_hash.equal protocol_hash Tezos_protocol_012_Psithaca.Protocol.hash then Some Ithaca else if Protocol_hash.equal protocol_hash Tezos_protocol_alpha.Protocol.hash then Some Alpha diff --git a/src/bin_client/dune b/src/bin_client/dune index 3a3938874b40436a13981dcea4bb764e5743e894..06b081c44f1531b44a328204d7e9784506248583 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -65,18 +65,18 @@ (select void_for_linking-tezos-client-011-PtHangz2-commands-registration from (tezos-client-011-PtHangz2-commands-registration -> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty) (-> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty)) - (select void_for_linking-tezos-client-012-PsiThaCa-commands-registration from - (tezos-client-012-PsiThaCa-commands-registration -> void_for_linking-tezos-client-012-PsiThaCa-commands-registration.empty) - (-> void_for_linking-tezos-client-012-PsiThaCa-commands-registration.empty)) + (select void_for_linking-tezos-client-012-Psithaca-commands-registration from + (tezos-client-012-Psithaca-commands-registration -> void_for_linking-tezos-client-012-Psithaca-commands-registration.empty) + (-> void_for_linking-tezos-client-012-Psithaca-commands-registration.empty)) (select void_for_linking-tezos-client-alpha-commands-registration from (tezos-client-alpha-commands-registration -> void_for_linking-tezos-client-alpha-commands-registration.empty) (-> void_for_linking-tezos-client-alpha-commands-registration.empty)) (select void_for_linking-tezos-baking-011-PtHangz2-commands-registration from (tezos-baking-011-PtHangz2-commands.registration -> void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty) (-> void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty)) - (select void_for_linking-tezos-baking-012-PsiThaCa-commands-registration from - (tezos-baking-012-PsiThaCa-commands.registration -> void_for_linking-tezos-baking-012-PsiThaCa-commands-registration.empty) - (-> void_for_linking-tezos-baking-012-PsiThaCa-commands-registration.empty)) + (select void_for_linking-tezos-baking-012-Psithaca-commands-registration from + (tezos-baking-012-Psithaca-commands.registration -> void_for_linking-tezos-baking-012-Psithaca-commands-registration.empty) + (-> void_for_linking-tezos-baking-012-Psithaca-commands-registration.empty)) (select void_for_linking-tezos-baking-alpha-commands-registration from (tezos-baking-alpha-commands.registration -> void_for_linking-tezos-baking-alpha-commands-registration.empty) (-> void_for_linking-tezos-baking-alpha-commands-registration.empty)) @@ -95,9 +95,9 @@ (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty) (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)) - (select void_for_linking-tezos-protocol-plugin-012-PsiThaCa from - (tezos-protocol-plugin-012-PsiThaCa -> void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty) - (-> void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty)) + (select void_for_linking-tezos-protocol-plugin-012-Psithaca from + (tezos-protocol-plugin-012-Psithaca -> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty) + (-> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty)) (select void_for_linking-tezos-protocol-plugin-alpha from (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) @@ -131,17 +131,17 @@ (write-file void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty "") (write-file void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty "") (write-file void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty "") - (write-file void_for_linking-tezos-client-012-PsiThaCa-commands-registration.empty "") + (write-file void_for_linking-tezos-client-012-Psithaca-commands-registration.empty "") (write-file void_for_linking-tezos-client-alpha-commands-registration.empty "") (write-file void_for_linking-tezos-baking-011-PtHangz2-commands-registration.empty "") - (write-file void_for_linking-tezos-baking-012-PsiThaCa-commands-registration.empty "") + (write-file void_for_linking-tezos-baking-012-Psithaca-commands-registration.empty "") (write-file void_for_linking-tezos-baking-alpha-commands-registration.empty "") (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "") (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "") (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "") (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "") (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "") - (write-file void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty "") + (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca.empty "") (write-file void_for_linking-tezos-protocol-plugin-alpha.empty "")))) (install diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam index d3a2083928073c1abf4dcff617bbee9b487eac02..eed0b4fd05042e3846e7e25d63116916c0d16d1a 100644 --- a/src/bin_client/tezos-client.opam +++ b/src/bin_client/tezos-client.opam @@ -36,17 +36,17 @@ depopts: [ "tezos-client-009-PsFLoren-commands-registration" "tezos-client-010-PtGRANAD-commands-registration" "tezos-client-011-PtHangz2-commands-registration" - "tezos-client-012-PsiThaCa-commands-registration" + "tezos-client-012-Psithaca-commands-registration" "tezos-client-alpha-commands-registration" "tezos-baking-011-PtHangz2-commands" - "tezos-baking-012-PsiThaCa-commands" + "tezos-baking-012-Psithaca-commands" "tezos-baking-alpha-commands" "tezos-protocol-plugin-007-PsDELPH1" "tezos-protocol-plugin-008-PtEdo2Zk" "tezos-protocol-plugin-009-PsFLoren" "tezos-protocol-plugin-010-PtGRANAD" "tezos-protocol-plugin-011-PtHangz2" - "tezos-protocol-plugin-012-PsiThaCa" + "tezos-protocol-plugin-012-Psithaca" "tezos-protocol-plugin-alpha" ] build: [ diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 5dbfa77f91220e5812b752c432e966d7aa9954ad..12d9d95d684de9e9c1def8dd299fe4ef266e5469 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -38,9 +38,9 @@ (select void_for_linking-tezos-client-011-PtHangz2 from (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty) (-> void_for_linking-tezos-client-011-PtHangz2.empty)) - (select void_for_linking-tezos-client-012-PsiThaCa from - (tezos-client-012-PsiThaCa -> void_for_linking-tezos-client-012-PsiThaCa.empty) - (-> void_for_linking-tezos-client-012-PsiThaCa.empty)) + (select void_for_linking-tezos-client-012-Psithaca from + (tezos-client-012-Psithaca -> void_for_linking-tezos-client-012-Psithaca.empty) + (-> void_for_linking-tezos-client-012-Psithaca.empty)) (select void_for_linking-tezos-client-alpha from (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) (-> void_for_linking-tezos-client-alpha.empty))) @@ -65,5 +65,5 @@ (write-file void_for_linking-tezos-client-009-PsFLoren.empty "") (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "") (write-file void_for_linking-tezos-client-011-PtHangz2.empty "") - (write-file void_for_linking-tezos-client-012-PsiThaCa.empty "") + (write-file void_for_linking-tezos-client-012-Psithaca.empty "") (write-file void_for_linking-tezos-client-alpha.empty "")))) diff --git a/src/bin_codec/tezos-codec.opam b/src/bin_codec/tezos-codec.opam index c374f3cc065969ab8dcfb647009aead61dee42f2..8b265a668972b253bdede3322c38baeb939b71c7 100644 --- a/src/bin_codec/tezos-codec.opam +++ b/src/bin_codec/tezos-codec.opam @@ -26,7 +26,7 @@ depopts: [ "tezos-client-009-PsFLoren" "tezos-client-010-PtGRANAD" "tezos-client-011-PtHangz2" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-client-alpha" ] build: [ diff --git a/src/bin_node/dune b/src/bin_node/dune index 4eadd6a12d7a89fb33b82aad703e57894b089af8..e680a1703b4a9b35a0125a5b7f54d9fe5d0f5f03 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -83,9 +83,9 @@ (select void_for_linking-tezos-embedded-protocol-011-PtHangz2 from (tezos-embedded-protocol-011-PtHangz2 -> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty) (-> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty)) - (select void_for_linking-tezos-embedded-protocol-012-PsiThaCa from - (tezos-embedded-protocol-012-PsiThaCa -> void_for_linking-tezos-embedded-protocol-012-PsiThaCa.empty) - (-> void_for_linking-tezos-embedded-protocol-012-PsiThaCa.empty)) + (select void_for_linking-tezos-embedded-protocol-012-Psithaca from + (tezos-embedded-protocol-012-Psithaca -> void_for_linking-tezos-embedded-protocol-012-Psithaca.empty) + (-> void_for_linking-tezos-embedded-protocol-012-Psithaca.empty)) (select void_for_linking-tezos-embedded-protocol-alpha from (tezos-embedded-protocol-alpha -> void_for_linking-tezos-embedded-protocol-alpha.empty) (-> void_for_linking-tezos-embedded-protocol-alpha.empty)) @@ -104,9 +104,9 @@ (select void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer from (tezos-protocol-plugin-011-PtHangz2-registerer -> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty) (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty)) - (select void_for_linking-tezos-protocol-plugin-012-PsiThaCa-registerer from - (tezos-protocol-plugin-012-PsiThaCa-registerer -> void_for_linking-tezos-protocol-plugin-012-PsiThaCa-registerer.empty) - (-> void_for_linking-tezos-protocol-plugin-012-PsiThaCa-registerer.empty)) + (select void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer from + (tezos-protocol-plugin-012-Psithaca-registerer -> void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty) + (-> void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty)) (select void_for_linking-tezos-protocol-plugin-alpha-registerer from (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty) (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty))) @@ -149,14 +149,14 @@ (write-file void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty "") (write-file void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty "") (write-file void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty "") - (write-file void_for_linking-tezos-embedded-protocol-012-PsiThaCa.empty "") + (write-file void_for_linking-tezos-embedded-protocol-012-Psithaca.empty "") (write-file void_for_linking-tezos-embedded-protocol-alpha.empty "") (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty "") (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty "") (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty "") (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty "") (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty "") - (write-file void_for_linking-tezos-protocol-plugin-012-PsiThaCa-registerer.empty "") + (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty "") (write-file void_for_linking-tezos-protocol-plugin-alpha-registerer.empty "")))) (install diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index fb8408820bd646fef3371338455435d08b360cc3..a10743f721eed0cd82a0565788805361fa31d467 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -186,7 +186,7 @@ let blockchain_network_ithacanet = ~chain_name:"TEZOS_ITHACANET_2021-12-22T15:00:00Z" ~sandboxed_chain_name:"SANDBOXED_TEZOS" ~user_activated_upgrades: - [(8191l, "PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP")] + [(8191l, "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A")] ~default_bootstrap_peers: [ "ithacanet.teztnets.xyz"; diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 2381b9598edbf4617ad364612cde6903b8e3a4d3..4721c0dc7dee6b114e7e661ad02ed2b25ecb0fdc 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -47,14 +47,14 @@ depopts: [ "tezos-embedded-protocol-009-PsFLoren" "tezos-embedded-protocol-010-PtGRANAD" "tezos-embedded-protocol-011-PtHangz2" - "tezos-embedded-protocol-012-PsiThaCa" + "tezos-embedded-protocol-012-Psithaca" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-007-PsDELPH1-registerer" "tezos-protocol-plugin-008-PtEdo2Zk-registerer" "tezos-protocol-plugin-009-PsFLoren-registerer" "tezos-protocol-plugin-010-PtGRANAD-registerer" "tezos-protocol-plugin-011-PtHangz2-registerer" - "tezos-protocol-plugin-012-PsiThaCa-registerer" + "tezos-protocol-plugin-012-Psithaca-registerer" "tezos-protocol-plugin-alpha-registerer" ] build: [ diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index e8ad43434c7ca9fa03d960cf4bc2bdd599c5d0f4..ca5924476316c9dbd1c25d2ba3d26d7de6173a8a 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -64,9 +64,9 @@ (select void_for_linking-tezos-client-011-PtHangz2 from (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty) (-> void_for_linking-tezos-client-011-PtHangz2.empty)) - (select void_for_linking-tezos-client-012-PsiThaCa from - (tezos-client-012-PsiThaCa -> void_for_linking-tezos-client-012-PsiThaCa.empty) - (-> void_for_linking-tezos-client-012-PsiThaCa.empty)) + (select void_for_linking-tezos-client-012-Psithaca from + (tezos-client-012-Psithaca -> void_for_linking-tezos-client-012-Psithaca.empty) + (-> void_for_linking-tezos-client-012-Psithaca.empty)) (select void_for_linking-tezos-client-alpha from (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) (-> void_for_linking-tezos-client-alpha.empty)) @@ -85,9 +85,9 @@ (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty) (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)) - (select void_for_linking-tezos-protocol-plugin-012-PsiThaCa from - (tezos-protocol-plugin-012-PsiThaCa -> void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty) - (-> void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty)) + (select void_for_linking-tezos-protocol-plugin-012-Psithaca from + (tezos-protocol-plugin-012-Psithaca -> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty) + (-> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty)) (select void_for_linking-tezos-protocol-plugin-alpha from (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) @@ -116,12 +116,12 @@ (write-file void_for_linking-tezos-client-009-PsFLoren.empty "") (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "") (write-file void_for_linking-tezos-client-011-PtHangz2.empty "") - (write-file void_for_linking-tezos-client-012-PsiThaCa.empty "") + (write-file void_for_linking-tezos-client-012-Psithaca.empty "") (write-file void_for_linking-tezos-client-alpha.empty "") (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "") (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "") (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "") (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "") (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "") - (write-file void_for_linking-tezos-protocol-plugin-012-PsiThaCa.empty "") + (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca.empty "") (write-file void_for_linking-tezos-protocol-plugin-alpha.empty "")))) diff --git a/src/bin_proxy_server/tezos-proxy-server.opam b/src/bin_proxy_server/tezos-proxy-server.opam index f67cb4312accc7208b61e09a837818f62bb2a4da..0d56196ff3bf55a4318d6d840d5b2a0097a7af7f 100644 --- a/src/bin_proxy_server/tezos-proxy-server.opam +++ b/src/bin_proxy_server/tezos-proxy-server.opam @@ -35,14 +35,14 @@ depopts: [ "tezos-client-009-PsFLoren" "tezos-client-010-PtGRANAD" "tezos-client-011-PtHangz2" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-client-alpha" "tezos-protocol-plugin-007-PsDELPH1" "tezos-protocol-plugin-008-PtEdo2Zk" "tezos-protocol-plugin-009-PsFLoren" "tezos-protocol-plugin-010-PtGRANAD" "tezos-protocol-plugin-011-PtHangz2" - "tezos-protocol-plugin-012-PsiThaCa" + "tezos-protocol-plugin-012-Psithaca" "tezos-protocol-plugin-alpha" ] build: [ diff --git a/src/lib_protocol_compiler/final_protocol_versions b/src/lib_protocol_compiler/final_protocol_versions index 657c36b1c8a934348dd31aee49b7f03385cc0e86..6294a0ffc4f5a609d502406bccf9977155e549c1 100644 --- a/src/lib_protocol_compiler/final_protocol_versions +++ b/src/lib_protocol_compiler/final_protocol_versions @@ -12,4 +12,4 @@ PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx -PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP \ No newline at end of file +Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A \ No newline at end of file diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/dune deleted file mode 100644 index 5d8519e98cf4aed6a4500e36077cfcc915054165..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/dune +++ /dev/null @@ -1,10 +0,0 @@ -(tests - (names test_uf - test_inference) - (package tezos-benchmark-type-inference-012-PsiThaCa) - (libraries tezos-micheline tezos-micheline-rewriting - tezos-benchmark-type-inference-012-PsiThaCa tezos-protocol-012-PsiThaCa - tezos-error-monad tezos-client-012-PsiThaCa) - (flags - (:standard -open Tezos_micheline - -open Tezos_benchmark_type_inference_012_PsiThaCa))) diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/dune b/src/proto_012_PsiThaCa/lib_benchmarks_proto/dune deleted file mode 100644 index c69fc009bd36c1d7b6a0b339ec23a291829d1c49..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_benchmarks_proto/dune +++ /dev/null @@ -1,31 +0,0 @@ -(library - (name tezos_benchmarks_proto_012_PsiThaCa) - (instrumentation (backend bisect_ppx)) - (public_name tezos-benchmarks-proto-012-PsiThaCa) - (libraries - tezos-base - tezos-protocol-012-PsiThaCa - tezos-protocol-012-PsiThaCa-parameters - tezos-benchmark - tezos-benchmark-012-PsiThaCa - tezos-shell-benchmarks - tezos-micheline - tezos-012-PsiThaCa-test-helpers - tezos-sapling - tezos-client-012-PsiThaCa -) - (library_flags (:standard -linkall)) - (flags (:standard -open Tezos_stdlib - -open Tezos_base - -open Tezos_base__TzPervasives - -open Tezos_error_monad - -open Tezos_benchmark - -open Tezos_benchmark_012_PsiThaCa - -open Tezos_benchmark_type_inference_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa - -open Tezos_raw_protocol_012_PsiThaCa - -open Tezos_client_012_PsiThaCa - -open Tezos_crypto - -open Tezos_micheline - -open Tezos_012_PsiThaCa_test_helpers - -open Tezos_client_012_PsiThaCa))) diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/dune b/src/proto_012_PsiThaCa/lib_client_sapling/dune deleted file mode 100644 index b57fcb2287ff0db7f3d7ee1fdc2bfa19db17aac4..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_client_sapling/dune +++ /dev/null @@ -1,19 +0,0 @@ -(library - (name tezos_client_sapling_012_PsiThaCa) - (instrumentation (backend bisect_ppx)) - (public_name tezos-client-sapling-012-PsiThaCa) - (libraries tezos-base - tezos-crypto - tezos-client-base - tezos-signer-backends - tezos-client-012-PsiThaCa - tezos-client-012-PsiThaCa-commands - tezos-protocol-012-PsiThaCa) - (library_flags (:standard -linkall)) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_stdlib_unix - -open Tezos_client_base - -open Tezos_client_012_PsiThaCa - -open Tezos_client_012_PsiThaCa_commands - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa))) diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/dune b/src/proto_012_PsiThaCa/lib_delegate/test/dune deleted file mode 100644 index c5c14c54356de2642fe4ec7e48163109a633aa0b..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_delegate/test/dune +++ /dev/null @@ -1,25 +0,0 @@ -(test - (name main) - (package tezos-baking-012-PsiThaCa) - (libraries - tezos-client-012-PsiThaCa - tezos_baking_012_PsiThaCa - tezos-baking-012-PsiThaCa.mockup-simulator - tezos-base-test-helpers - tezos-protocol-012-PsiThaCa-parameters - tezos-crypto - alcotest-lwt) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_micheline - -open Tezos_client_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa - -open Tezos_base_test_helpers - -open Tezos_012_PsiThaCa_mockup_simulator - -open Tezos_baking_012_PsiThaCa)) - (action (run %{exe:main.exe} -q -e))) - -(rule - (alias runtest_lint) - (deps (glob_files *.ml{,i})) - (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_012_PsiThaCa/lib_plugin/dune b/src/proto_012_PsiThaCa/lib_plugin/dune deleted file mode 100644 index aa7a0db4f65445ff1dafceb2a843b6588610d618..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_plugin/dune +++ /dev/null @@ -1,27 +0,0 @@ -(library - (name tezos_protocol_plugin_012_PsiThaCa) - (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-plugin-012-PsiThaCa) - (libraries tezos-base - tezos-protocol-012-PsiThaCa - tezos-stdlib-unix - ) - (modules (:standard) \ Plugin_registerer) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa - -open Tezos_stdlib_unix - ))) - -(library - (name tezos_protocol_plugin_012_PsiThaCa_registerer) - (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-plugin-012-PsiThaCa-registerer) - (libraries tezos-base - tezos-embedded-protocol-012-PsiThaCa - tezos-protocol-plugin-012-PsiThaCa - tezos-shell) - (modules Plugin_registerer) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_embedded_protocol_012_PsiThaCa - -open Tezos_protocol_plugin_012_PsiThaCa - -open Tezos_shell))) diff --git a/src/proto_012_PsiThaCa/lib_plugin/test/dune b/src/proto_012_PsiThaCa/lib_plugin/test/dune deleted file mode 100644 index 3177afccaf8ce66cd5935a86fba224b88d165bf0..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_plugin/test/dune +++ /dev/null @@ -1,16 +0,0 @@ -(test - (name test_consensus_filter) - (package tezos-protocol-plugin-012-PsiThaCa) - (libraries tezos-base - alcotest-lwt - tezos-test-helpers - qcheck-alcotest - tezos-stdlib-unix - tezos-protocol-012-PsiThaCa-parameters - tezos-protocol-plugin-012-PsiThaCa) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_micheline - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_plugin_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa.Protocol))) diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/dune b/src/proto_012_PsiThaCa/lib_protocol/test/helpers/dune deleted file mode 100644 index 6c4ee394fe14a79d213bef5b474201abbc2f0af6..0000000000000000000000000000000000000000 --- a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/dune +++ /dev/null @@ -1,24 +0,0 @@ -(library - (name tezos_012_PsiThaCa_test_helpers) - (instrumentation (backend bisect_ppx)) - (public_name tezos-012-PsiThaCa-test-helpers) - (libraries alcotest-lwt - qcheck-alcotest - tezos-test-helpers - tezos-base - tezos-micheline - tezos-stdlib-unix - tezos-shell-services - tezos-protocol-environment - tezos-protocol-012-PsiThaCa - tezos-protocol-012-PsiThaCa-parameters - tezos-client-012-PsiThaCa - tezos-protocol-plugin-012-PsiThaCa) - (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_micheline - -open Tezos_stdlib_unix - -open Tezos_protocol_012_PsiThaCa - -open Tezos_client_012_PsiThaCa - -open Tezos_protocol_plugin_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa - -open Tezos_shell_services))) diff --git a/src/proto_012_PsiThaCa/bin_accuser/.ocamlformat b/src/proto_012_Psithaca/bin_accuser/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/bin_accuser/.ocamlformat rename to src/proto_012_Psithaca/bin_accuser/.ocamlformat diff --git a/src/proto_012_PsiThaCa/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune similarity index 59% rename from src/proto_012_PsiThaCa/bin_accuser/dune rename to src/proto_012_Psithaca/bin_accuser/dune index 2c93b1f051a20be652b947e0f9b96243b79358b8..4da948f22e4901cc4bc37479588e21b90a056910 100644 --- a/src/proto_012_PsiThaCa/bin_accuser/dune +++ b/src/proto_012_Psithaca/bin_accuser/dune @@ -5,16 +5,16 @@ -ccopt -static)))) (executable - (name main_accuser_012_PsiThaCa) + (name main_accuser_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-accuser-012-PsiThaCa) + (public_name tezos-accuser-012-Psithaca) (libraries tezos-client-base-unix tezos-client-commands - tezos-baking-012-PsiThaCa-commands) + tezos-baking-012-Psithaca-commands) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa - -open Tezos_client_012_PsiThaCa + -open Tezos_protocol_012_Psithaca + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_baking_012_PsiThaCa_commands + -open Tezos_baking_012_Psithaca_commands -open Tezos_stdlib_unix -open Tezos_client_base_unix))) diff --git a/src/proto_012_PsiThaCa/bin_accuser/dune-project b/src/proto_012_Psithaca/bin_accuser/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/bin_accuser/dune-project rename to src/proto_012_Psithaca/bin_accuser/dune-project diff --git a/src/proto_012_PsiThaCa/bin_accuser/main_accuser_012_PsiThaCa.ml b/src/proto_012_Psithaca/bin_accuser/main_accuser_012_Psithaca.ml similarity index 100% rename from src/proto_012_PsiThaCa/bin_accuser/main_accuser_012_PsiThaCa.ml rename to src/proto_012_Psithaca/bin_accuser/main_accuser_012_Psithaca.ml diff --git a/src/proto_012_PsiThaCa/bin_accuser/tezos-accuser-012-PsiThaCa.opam b/src/proto_012_Psithaca/bin_accuser/tezos-accuser-012-Psithaca.opam similarity index 87% rename from src/proto_012_PsiThaCa/bin_accuser/tezos-accuser-012-PsiThaCa.opam rename to src/proto_012_Psithaca/bin_accuser/tezos-accuser-012-Psithaca.opam index af2698e098130b36eeeedffb1e1fef0dee37bc3d..d1b3fe99ff3ac789842cce0fcf524fd59147f720 100644 --- a/src/proto_012_PsiThaCa/bin_accuser/tezos-accuser-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/bin_accuser/tezos-accuser-012-Psithaca.opam @@ -8,9 +8,9 @@ license: "MIT" depends: [ "dune" { >= "2.9" } "tezos-base" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-client-commands" - "tezos-baking-012-PsiThaCa-commands" + "tezos-baking-012-Psithaca-commands" "tezos-client-base-unix" ] build: [ diff --git a/src/proto_012_PsiThaCa/bin_baker/.ocamlformat b/src/proto_012_Psithaca/bin_baker/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/bin_baker/.ocamlformat rename to src/proto_012_Psithaca/bin_baker/.ocamlformat diff --git a/src/proto_012_PsiThaCa/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune similarity index 59% rename from src/proto_012_PsiThaCa/bin_baker/dune rename to src/proto_012_Psithaca/bin_baker/dune index 9c8f57185f45182450c88d463c978a3bae94ea73..dd7b9eadd9bd46788e5a243400c0398e90b64b22 100644 --- a/src/proto_012_PsiThaCa/bin_baker/dune +++ b/src/proto_012_Psithaca/bin_baker/dune @@ -5,16 +5,16 @@ -ccopt -static)))) (executable - (name main_baker_012_PsiThaCa) + (name main_baker_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-baker-012-PsiThaCa) + (public_name tezos-baker-012-Psithaca) (libraries tezos-client-base-unix tezos-client-commands - tezos-baking-012-PsiThaCa-commands) + tezos-baking-012-Psithaca-commands) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa - -open Tezos_client_012_PsiThaCa + -open Tezos_protocol_012_Psithaca + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_baking_012_PsiThaCa_commands + -open Tezos_baking_012_Psithaca_commands -open Tezos_stdlib_unix -open Tezos_client_base_unix))) diff --git a/src/proto_012_PsiThaCa/bin_baker/dune-project b/src/proto_012_Psithaca/bin_baker/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/bin_baker/dune-project rename to src/proto_012_Psithaca/bin_baker/dune-project diff --git a/src/proto_012_PsiThaCa/bin_baker/main_baker_012_PsiThaCa.ml b/src/proto_012_Psithaca/bin_baker/main_baker_012_Psithaca.ml similarity index 100% rename from src/proto_012_PsiThaCa/bin_baker/main_baker_012_PsiThaCa.ml rename to src/proto_012_Psithaca/bin_baker/main_baker_012_Psithaca.ml diff --git a/src/proto_012_PsiThaCa/bin_baker/tezos-baker-012-PsiThaCa.opam b/src/proto_012_Psithaca/bin_baker/tezos-baker-012-Psithaca.opam similarity index 87% rename from src/proto_012_PsiThaCa/bin_baker/tezos-baker-012-PsiThaCa.opam rename to src/proto_012_Psithaca/bin_baker/tezos-baker-012-Psithaca.opam index 6a7e5af4c69f6da842ffe9e889d9de6cc1002928..9613387a4af7e57b351a9af1f73ab19ca3d4b5bf 100644 --- a/src/proto_012_PsiThaCa/bin_baker/tezos-baker-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/bin_baker/tezos-baker-012-Psithaca.opam @@ -8,9 +8,9 @@ license: "MIT" depends: [ "dune" { >= "2.9" } "tezos-base" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-client-commands" - "tezos-baking-012-PsiThaCa-commands" + "tezos-baking-012-Psithaca-commands" "tezos-client-base-unix" ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_benchmark/.ocamlformat b/src/proto_012_Psithaca/lib_benchmark/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/.ocamlformat rename to src/proto_012_Psithaca/lib_benchmark/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_benchmark/README.md b/src/proto_012_Psithaca/lib_benchmark/README.md similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/README.md rename to src/proto_012_Psithaca/lib_benchmark/README.md diff --git a/src/proto_012_PsiThaCa/lib_benchmark/autocomp.ml b/src/proto_012_Psithaca/lib_benchmark/autocomp.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/autocomp.ml rename to src/proto_012_Psithaca/lib_benchmark/autocomp.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/dune b/src/proto_012_Psithaca/lib_benchmark/dune similarity index 56% rename from src/proto_012_PsiThaCa/lib_benchmark/dune rename to src/proto_012_Psithaca/lib_benchmark/dune index 4ee550cb1d1152c47a410686248f52b58b0bcbb6..b667f8872dfc46347a4d5ed30868513c787e3d3a 100644 --- a/src/proto_012_PsiThaCa/lib_benchmark/dune +++ b/src/proto_012_Psithaca/lib_benchmark/dune @@ -1,17 +1,17 @@ (library - (name tezos_benchmark_012_PsiThaCa) + (name tezos_benchmark_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-benchmark-012-PsiThaCa) + (public_name tezos-benchmark-012-Psithaca) (libraries tezos-base - tezos-protocol-012-PsiThaCa - tezos-protocol-012-PsiThaCa-parameters + tezos-protocol-012-Psithaca + tezos-protocol-012-Psithaca-parameters tezos-micheline-rewriting tezos-benchmark - tezos-benchmark-type-inference-012-PsiThaCa + tezos-benchmark-type-inference-012-Psithaca hashcons benchmark-utils - tezos-012-PsiThaCa-test-helpers + tezos-012-Psithaca-test-helpers prbnmcn-stats) (library_flags (:standard -linkall)) (private_modules kernel rules state_space) @@ -21,7 +21,7 @@ -open Tezos_micheline -open Tezos_micheline_rewriting -open Tezos_benchmark - -open Tezos_benchmark_type_inference_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa + -open Tezos_benchmark_type_inference_012_Psithaca + -open Tezos_protocol_012_Psithaca -open Tezos_crypto - -open Tezos_012_PsiThaCa_test_helpers))) + -open Tezos_012_Psithaca_test_helpers))) diff --git a/src/proto_012_PsiThaCa/lib_benchmark/dune-project b/src/proto_012_Psithaca/lib_benchmark/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/dune-project rename to src/proto_012_Psithaca/lib_benchmark/dune-project diff --git a/src/proto_012_PsiThaCa/lib_benchmark/execution_context.ml b/src/proto_012_Psithaca/lib_benchmark/execution_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/execution_context.ml rename to src/proto_012_Psithaca/lib_benchmark/execution_context.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/kernel.ml b/src/proto_012_Psithaca/lib_benchmark/kernel.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/kernel.ml rename to src/proto_012_Psithaca/lib_benchmark/kernel.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/.ocamlformat b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/.ocamlformat rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune similarity index 63% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/dune rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune index aa61df0fd5bac7217078871a855193ff7543cbf2..e35b280f4d82e8eb4075dbc717b28b29a4c0b06a 100644 --- a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune @@ -1,17 +1,17 @@ (library - (name tezos_benchmark_type_inference_012_PsiThaCa) + (name tezos_benchmark_type_inference_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-benchmark-type-inference-012-PsiThaCa) + (public_name tezos-benchmark-type-inference-012-Psithaca) (libraries tezos-stdlib tezos-error-monad tezos-crypto tezos-micheline - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-micheline-rewriting hashcons) (flags (:standard -open Tezos_stdlib -open Tezos_error_monad -open Tezos_micheline -open Tezos_micheline_rewriting - -open Tezos_protocol_012_PsiThaCa))) + -open Tezos_protocol_012_Psithaca))) diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/dune-project b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/dune-project rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune-project diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/inference.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/inference.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/inference.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/inference.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/inference.mli b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/inference.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/inference.mli rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/inference.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/int_map.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/int_map.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/int_map.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/int_map.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/monads.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/monads.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/monads.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/monads.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/stores.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/stores.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/stores.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/stores.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/.ocamlformat b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/.ocamlformat rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/.ocamlformat diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune new file mode 100644 index 0000000000000000000000000000000000000000..a8e7aed807e93dad0b451de9a8c7f53865f2e67c --- /dev/null +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -0,0 +1,10 @@ +(tests + (names test_uf + test_inference) + (package tezos-benchmark-type-inference-012-Psithaca) + (libraries tezos-micheline tezos-micheline-rewriting + tezos-benchmark-type-inference-012-Psithaca tezos-protocol-012-Psithaca + tezos-error-monad tezos-client-012-Psithaca) + (flags + (:standard -open Tezos_micheline + -open Tezos_benchmark_type_inference_012_Psithaca))) diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/test_inference.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/test_inference.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/test_inference.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/test_inference.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/test_uf.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/test_uf.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/test/test_uf.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/test_uf.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-Psithaca.opam similarity index 88% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-Psithaca.opam index 4d0290ddcd4ccd4e83e2ac7e07d1456b1bd1a9fa..9e280a7c7b4e6ada13f55881a7caa4cd22436eb0 100644 --- a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/tezos-benchmark-type-inference-012-Psithaca.opam @@ -7,12 +7,12 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "tezos-client-012-PsiThaCa" { with-test } + "tezos-client-012-Psithaca" { with-test } "dune" { >= "1.11" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-micheline" "tezos-micheline-rewriting" "hashcons" diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/type.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/type.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/type.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/type.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/type.mli b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/type.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/type.mli rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/type.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/uf.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/uf.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/lib_benchmark_type_inference/uf.ml rename to src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/uf.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/micheline_sampler.ml b/src/proto_012_Psithaca/lib_benchmark/micheline_sampler.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/micheline_sampler.ml rename to src/proto_012_Psithaca/lib_benchmark/micheline_sampler.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/micheline_sampler.mli b/src/proto_012_Psithaca/lib_benchmark/micheline_sampler.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/micheline_sampler.mli rename to src/proto_012_Psithaca/lib_benchmark/micheline_sampler.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_mcmc_samplers.ml b/src/proto_012_Psithaca/lib_benchmark/michelson_mcmc_samplers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_mcmc_samplers.ml rename to src/proto_012_Psithaca/lib_benchmark/michelson_mcmc_samplers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_mcmc_samplers.mli b/src/proto_012_Psithaca/lib_benchmark/michelson_mcmc_samplers.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_mcmc_samplers.mli rename to src/proto_012_Psithaca/lib_benchmark/michelson_mcmc_samplers.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers.ml b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers.ml rename to src/proto_012_Psithaca/lib_benchmark/michelson_samplers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers.mli b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers.mli rename to src/proto_012_Psithaca/lib_benchmark/michelson_samplers.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers_base.ml b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers_base.ml rename to src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers_base.mli b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/michelson_samplers_base.mli rename to src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmark/mikhailsky_to_michelson.ml b/src/proto_012_Psithaca/lib_benchmark/mikhailsky_to_michelson.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/mikhailsky_to_michelson.ml rename to src/proto_012_Psithaca/lib_benchmark/mikhailsky_to_michelson.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/rules.ml b/src/proto_012_Psithaca/lib_benchmark/rules.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/rules.ml rename to src/proto_012_Psithaca/lib_benchmark/rules.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/sampling_helpers.ml b/src/proto_012_Psithaca/lib_benchmark/sampling_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/sampling_helpers.ml rename to src/proto_012_Psithaca/lib_benchmark/sampling_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/state_space.ml b/src/proto_012_Psithaca/lib_benchmark/state_space.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/state_space.ml rename to src/proto_012_Psithaca/lib_benchmark/state_space.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/.ocamlformat b/src/proto_012_Psithaca/lib_benchmark/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/.ocamlformat rename to src/proto_012_Psithaca/lib_benchmark/test/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/dune b/src/proto_012_Psithaca/lib_benchmark/test/dune similarity index 67% rename from src/proto_012_PsiThaCa/lib_benchmark/test/dune rename to src/proto_012_Psithaca/lib_benchmark/test/dune index 89d44539b8092e1ad91bdd330daf87e54b1a4eda..55dbcd73f4479a91332ef307b975b4744d85f4e1 100644 --- a/src/proto_012_PsiThaCa/lib_benchmark/test/dune +++ b/src/proto_012_Psithaca/lib_benchmark/test/dune @@ -2,11 +2,11 @@ (names test_sampling_data test_sampling_code test_autocompletion test_distribution) (libraries tezos-micheline tezos-micheline-rewriting - tezos-benchmark-type-inference-012-PsiThaCa + tezos-benchmark-type-inference-012-Psithaca tezos-benchmark - tezos-benchmark-012-PsiThaCa - tezos-protocol-012-PsiThaCa - tezos-012-PsiThaCa-test-helpers + tezos-benchmark-012-Psithaca + tezos-protocol-012-Psithaca + tezos-012-Psithaca-test-helpers tezos-error-monad alcotest-lwt prbnmcn-stats) @@ -14,11 +14,11 @@ ;; (ocamlopt_flags (:standard -p -ccopt -no-pie)) (flags (:standard -open Tezos_micheline - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -open Tezos_benchmark - -open Tezos_benchmark_type_inference_012_PsiThaCa - -open Tezos_benchmark_012_PsiThaCa - -open Tezos_012_PsiThaCa_test_helpers))) + -open Tezos_benchmark_type_inference_012_Psithaca + -open Tezos_benchmark_012_Psithaca + -open Tezos_012_Psithaca_test_helpers))) (alias (name buildtest) @@ -35,7 +35,7 @@ (alias (name runtest) - (package tezos-benchmark-012-PsiThaCa) + (package tezos-benchmark-012-Psithaca) (deps (alias runtest_micheline_rewriting_data) (alias runtest_micheline_rewriting_code) )) diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/test_autocompletion.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_autocompletion.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/test_autocompletion.ml rename to src/proto_012_Psithaca/lib_benchmark/test/test_autocompletion.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/test_distribution.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/test_distribution.ml rename to src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/test_helpers.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/test_helpers.ml rename to src/proto_012_Psithaca/lib_benchmark/test/test_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/test_sampling_code.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/test_sampling_code.ml rename to src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/test/test_sampling_data.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/test/test_sampling_data.ml rename to src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/tezos-benchmark-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_benchmark/tezos-benchmark-012-Psithaca.opam similarity index 79% rename from src/proto_012_PsiThaCa/lib_benchmark/tezos-benchmark-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_benchmark/tezos-benchmark-012-Psithaca.opam index 3ff53fdcbb036cb2cf78a2c566ddb2b9bdb3bcd3..542bbb9023fa36673fc17effeb92dae37df4f9d9 100644 --- a/src/proto_012_PsiThaCa/lib_benchmark/tezos-benchmark-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_benchmark/tezos-benchmark-012-Psithaca.opam @@ -11,14 +11,14 @@ depends: [ "tezos-base" "tezos-benchmark" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" - "tezos-012-PsiThaCa-test-helpers" - "tezos-protocol-012-PsiThaCa-parameters" + "tezos-protocol-012-Psithaca" + "tezos-012-Psithaca-test-helpers" + "tezos-protocol-012-Psithaca-parameters" "tezos-micheline-rewriting" - "tezos-benchmark-type-inference-012-PsiThaCa" + "tezos-benchmark-type-inference-012-Psithaca" "hashcons" "benchmark-utils" - "tezos-012-PsiThaCa-test-helpers" + "tezos-012-Psithaca-test-helpers" "prbnmcn-stats" { = "0.0.2" } "tezos-micheline" { with-test } "tezos-error-monad" { with-test } diff --git a/src/proto_012_PsiThaCa/lib_benchmark/type_helpers.ml b/src/proto_012_Psithaca/lib_benchmark/type_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/type_helpers.ml rename to src/proto_012_Psithaca/lib_benchmark/type_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmark/type_helpers.mli b/src/proto_012_Psithaca/lib_benchmark/type_helpers.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmark/type_helpers.mli rename to src/proto_012_Psithaca/lib_benchmark/type_helpers.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/.ocamlformat b/src/proto_012_Psithaca/lib_benchmarks_proto/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/.ocamlformat rename to src/proto_012_Psithaca/lib_benchmarks_proto/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/cache_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/cache_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/cache_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/cache_benchmarks.ml diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/dune b/src/proto_012_Psithaca/lib_benchmarks_proto/dune new file mode 100644 index 0000000000000000000000000000000000000000..3b2e17f1f7147ccd2c130f53e5edf2fb1961590f --- /dev/null +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/dune @@ -0,0 +1,31 @@ +(library + (name tezos_benchmarks_proto_012_Psithaca) + (instrumentation (backend bisect_ppx)) + (public_name tezos-benchmarks-proto-012-Psithaca) + (libraries + tezos-base + tezos-protocol-012-Psithaca + tezos-protocol-012-Psithaca-parameters + tezos-benchmark + tezos-benchmark-012-Psithaca + tezos-shell-benchmarks + tezos-micheline + tezos-012-Psithaca-test-helpers + tezos-sapling + tezos-client-012-Psithaca +) + (library_flags (:standard -linkall)) + (flags (:standard -open Tezos_stdlib + -open Tezos_base + -open Tezos_base__TzPervasives + -open Tezos_error_monad + -open Tezos_benchmark + -open Tezos_benchmark_012_Psithaca + -open Tezos_benchmark_type_inference_012_Psithaca + -open Tezos_protocol_012_Psithaca + -open Tezos_raw_protocol_012_Psithaca + -open Tezos_client_012_Psithaca + -open Tezos_crypto + -open Tezos_micheline + -open Tezos_012_Psithaca_test_helpers + -open Tezos_client_012_Psithaca))) diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/dune-project b/src/proto_012_Psithaca/lib_benchmarks_proto/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/dune-project rename to src/proto_012_Psithaca/lib_benchmarks_proto/dune-project diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/encodings_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/encodings_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/encodings_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/encodings_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/gas_helpers.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/gas_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/gas_helpers.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/gas_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/global_constants_storage_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/global_constants_storage_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/global_constants_storage_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/global_constants_storage_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_model.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_model.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_model.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_model.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_workload.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_workload.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/interpreter_workload.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/interpreter_workload.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_commands.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_generation.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_generation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_generation.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/michelson_generation.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_generation.mli b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_generation.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_generation.mli rename to src/proto_012_Psithaca/lib_benchmarks_proto/michelson_generation.mli diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_types.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_types.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/michelson_types.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/michelson_types.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/registration_helpers.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/registration_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/registration_helpers.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/registration_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/sapling_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_commands.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_generation.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/sapling_generation.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/sapling_generation.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/script_repr_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/script_repr_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/script_repr_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/script_repr_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/script_typed_ir_size_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/script_typed_ir_size_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/script_typed_ir_size_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/script_typed_ir_size_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/size.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/size.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/size.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/size.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/tags.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/tags.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/tags.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/tags.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/tezos-benchmarks-proto-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_benchmarks_proto/tezos-benchmarks-proto-012-Psithaca.opam similarity index 77% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/tezos-benchmarks-proto-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_benchmarks_proto/tezos-benchmarks-proto-012-Psithaca.opam index f527ccccda6f21a90707a993a16c69e4ee58c623..214f6bb6335890bf85e62195121c65f25960e604 100644 --- a/src/proto_012_PsiThaCa/lib_benchmarks_proto/tezos-benchmarks-proto-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/tezos-benchmarks-proto-012-Psithaca.opam @@ -10,15 +10,15 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-benchmark" - "tezos-benchmark-012-PsiThaCa" + "tezos-benchmark-012-Psithaca" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" - "tezos-protocol-012-PsiThaCa-parameters" + "tezos-protocol-012-Psithaca" + "tezos-protocol-012-Psithaca-parameters" "tezos-shell-benchmarks" "tezos-micheline" - "tezos-012-PsiThaCa-test-helpers" + "tezos-012-Psithaca-test-helpers" "tezos-sapling" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_benchmarks.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/translator_benchmarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_benchmarks.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/translator_benchmarks.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_model.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/translator_model.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_model.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/translator_model.ml diff --git a/src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_workload.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/translator_workload.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_benchmarks_proto/translator_workload.ml rename to src/proto_012_Psithaca/lib_benchmarks_proto/translator_workload.ml diff --git a/src/proto_012_PsiThaCa/lib_client/.ocamlformat b/src/proto_012_Psithaca/lib_client/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/.ocamlformat rename to src/proto_012_Psithaca/lib_client/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_client/annotated_manager_operation.ml b/src/proto_012_Psithaca/lib_client/annotated_manager_operation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/annotated_manager_operation.ml rename to src/proto_012_Psithaca/lib_client/annotated_manager_operation.ml diff --git a/src/proto_012_PsiThaCa/lib_client/annotated_manager_operation.mli b/src/proto_012_Psithaca/lib_client/annotated_manager_operation.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/annotated_manager_operation.mli rename to src/proto_012_Psithaca/lib_client/annotated_manager_operation.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_args.ml b/src/proto_012_Psithaca/lib_client/client_proto_args.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_args.ml rename to src/proto_012_Psithaca/lib_client/client_proto_args.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_args.mli b/src/proto_012_Psithaca/lib_client/client_proto_args.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_args.mli rename to src/proto_012_Psithaca/lib_client/client_proto_args.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_context.ml b/src/proto_012_Psithaca/lib_client/client_proto_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_context.ml rename to src/proto_012_Psithaca/lib_client/client_proto_context.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_context.mli b/src/proto_012_Psithaca/lib_client/client_proto_context.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_context.mli rename to src/proto_012_Psithaca/lib_client/client_proto_context.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_contracts.ml b/src/proto_012_Psithaca/lib_client/client_proto_contracts.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_contracts.ml rename to src/proto_012_Psithaca/lib_client/client_proto_contracts.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_contracts.mli b/src/proto_012_Psithaca/lib_client/client_proto_contracts.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_contracts.mli rename to src/proto_012_Psithaca/lib_client/client_proto_contracts.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_fa12.ml b/src/proto_012_Psithaca/lib_client/client_proto_fa12.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_fa12.ml rename to src/proto_012_Psithaca/lib_client/client_proto_fa12.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_fa12.mli b/src/proto_012_Psithaca/lib_client/client_proto_fa12.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_fa12.mli rename to src/proto_012_Psithaca/lib_client/client_proto_fa12.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_multisig.ml b/src/proto_012_Psithaca/lib_client/client_proto_multisig.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_multisig.ml rename to src/proto_012_Psithaca/lib_client/client_proto_multisig.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_multisig.mli b/src/proto_012_Psithaca/lib_client/client_proto_multisig.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_multisig.mli rename to src/proto_012_Psithaca/lib_client/client_proto_multisig.mli diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_programs.ml b/src/proto_012_Psithaca/lib_client/client_proto_programs.ml similarity index 97% rename from src/proto_012_PsiThaCa/lib_client/client_proto_programs.ml rename to src/proto_012_Psithaca/lib_client/client_proto_programs.ml index b0b1b295e529416725d6b33bce9a30948efe053c..b4c8085d838fed341ca33b6b594de6b945598ca4 100644 --- a/src/proto_012_PsiThaCa/lib_client/client_proto_programs.ml +++ b/src/proto_012_Psithaca/lib_client/client_proto_programs.ml @@ -51,7 +51,15 @@ module Program = Client_aliases.Alias (struct let name = "script" end) -let print_errors ?parsed (cctxt : #Client_context.printer) errs ~show_source = +let print_errors ?parsed (cctxt : #Protocol_client_context.full) errs + ~show_source = + Michelson_v1_error_reporter.enrich_runtime_errors + cctxt + ~chain:cctxt#chain + ~block:cctxt#block + ~parsed + errs + >>= fun errs -> cctxt#warning "%a" (Michelson_v1_error_reporter.report_errors @@ -62,7 +70,7 @@ let print_errors ?parsed (cctxt : #Client_context.printer) errs ~show_source = >>= fun () -> cctxt#error "error running script" >>= fun () -> return_unit -let print_view_result (cctxt : #Client_context.printer) = function +let print_view_result (cctxt : #Protocol_client_context.full) = function | Ok expr -> cctxt#message "%a" print_expr expr >>= fun () -> return_unit | Error errs -> print_errors cctxt ~show_source:false errs diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_programs.mli b/src/proto_012_Psithaca/lib_client/client_proto_programs.mli similarity index 96% rename from src/proto_012_PsiThaCa/lib_client/client_proto_programs.mli rename to src/proto_012_Psithaca/lib_client/client_proto_programs.mli index 16c9a45acfff83bc572ccd2daec90051bcb48416..ac9a32a368b1c6887555a41b6bb303f550d35a14 100644 --- a/src/proto_012_PsiThaCa/lib_client/client_proto_programs.mli +++ b/src/proto_012_Psithaca/lib_client/client_proto_programs.mli @@ -89,10 +89,12 @@ val trace : Lwt.t val print_view_result : - #Client_context.printer -> Script_repr.expr tzresult -> unit tzresult Lwt.t + #Protocol_client_context.full -> + Script_repr.expr tzresult -> + unit tzresult Lwt.t val print_run_result : - #Client_context.printer -> + #Protocol_client_context.full -> show_source:bool -> parsed:Michelson_v1_parser.parsed -> (Script_repr.expr @@ -102,7 +104,7 @@ val print_run_result : unit tzresult Lwt.t val print_trace_result : - #Client_context.printer -> + #Protocol_client_context.full -> show_source:bool -> parsed:Michelson_v1_parser.parsed -> (Script_repr.expr @@ -162,7 +164,7 @@ val entrypoint_type : Script.expr option tzresult Lwt.t val print_entrypoint_type : - #Client_context.printer -> + #Protocol_client_context.full -> emacs:bool -> ?script_name:string -> show_source:bool -> @@ -179,7 +181,7 @@ val list_entrypoints : (string * Script.expr) list tzresult Lwt.t val print_entrypoints_list : - #Client_context.printer -> + #Protocol_client_context.full -> emacs:bool -> ?script_name:string -> show_source:bool -> @@ -195,7 +197,7 @@ val list_unreachables : Michelson_v1_primitives.prim list list tzresult Lwt.t val print_unreachables : - #Client_context.printer -> + #Protocol_client_context.full -> emacs:bool -> ?script_name:string -> show_source:bool -> diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_utils.ml b/src/proto_012_Psithaca/lib_client/client_proto_utils.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_utils.ml rename to src/proto_012_Psithaca/lib_client/client_proto_utils.ml diff --git a/src/proto_012_PsiThaCa/lib_client/client_proto_utils.mli b/src/proto_012_Psithaca/lib_client/client_proto_utils.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/client_proto_utils.mli rename to src/proto_012_Psithaca/lib_client/client_proto_utils.mli diff --git a/src/proto_012_PsiThaCa/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune similarity index 57% rename from src/proto_012_PsiThaCa/lib_client/dune rename to src/proto_012_Psithaca/lib_client/dune index fba74831c2ab0143f98547438f34bbf54c999305..bdc999eca4ed1cddf37200af0d45f205aa8dd2ad 100644 --- a/src/proto_012_PsiThaCa/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -1,24 +1,24 @@ (library - (name tezos_client_012_PsiThaCa) + (name tezos_client_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-client-012-PsiThaCa) + (public_name tezos-client-012-Psithaca) (libraries tezos-base - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-shell-services tezos-client-base tezos-mockup-registration tezos-proxy tezos-rpc tezos-signer-backends - tezos-protocol-012-PsiThaCa-parameters - tezos-protocol-plugin-012-PsiThaCa) + tezos-protocol-012-Psithaca-parameters + tezos-protocol-plugin-012-Psithaca) (inline_tests) (preprocess (pps ppx_inline_test)) (library_flags (:standard -linkall)) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_shell_services -open Tezos_client_base - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_plugin_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa_parameters + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_plugin_012_Psithaca + -open Tezos_protocol_012_Psithaca_parameters -open Tezos_rpc))) diff --git a/src/proto_012_PsiThaCa/lib_client/dune-project b/src/proto_012_Psithaca/lib_client/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/dune-project rename to src/proto_012_Psithaca/lib_client/dune-project diff --git a/src/proto_012_PsiThaCa/lib_client/injection.ml b/src/proto_012_Psithaca/lib_client/injection.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/injection.ml rename to src/proto_012_Psithaca/lib_client/injection.ml diff --git a/src/proto_012_PsiThaCa/lib_client/injection.mli b/src/proto_012_Psithaca/lib_client/injection.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/injection.mli rename to src/proto_012_Psithaca/lib_client/injection.mli diff --git a/src/proto_012_PsiThaCa/lib_client/light.ml b/src/proto_012_Psithaca/lib_client/light.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/light.ml rename to src/proto_012_Psithaca/lib_client/light.ml diff --git a/src/proto_012_PsiThaCa/lib_client/limit.ml b/src/proto_012_Psithaca/lib_client/limit.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/limit.ml rename to src/proto_012_Psithaca/lib_client/limit.ml diff --git a/src/proto_012_PsiThaCa/lib_client/limit.mli b/src/proto_012_Psithaca/lib_client/limit.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/limit.mli rename to src/proto_012_Psithaca/lib_client/limit.mli diff --git a/src/proto_012_PsiThaCa/lib_client/managed_contract.ml b/src/proto_012_Psithaca/lib_client/managed_contract.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/managed_contract.ml rename to src/proto_012_Psithaca/lib_client/managed_contract.ml diff --git a/src/proto_012_PsiThaCa/lib_client/managed_contract.mli b/src/proto_012_Psithaca/lib_client/managed_contract.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/managed_contract.mli rename to src/proto_012_Psithaca/lib_client/managed_contract.mli diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_emacs.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_emacs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_emacs.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_emacs.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_emacs.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_emacs.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_emacs.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_emacs.mli diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_entrypoints.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_entrypoints.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_entrypoints.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_entrypoints.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_entrypoints.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_entrypoints.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_entrypoints.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_entrypoints.mli diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.ml similarity index 93% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.ml index fcbfb443c7a2aa2a1f5f7a5f83cb979c0e8a0540..2aae382fa4f5e5324c3127bb3281be1c4200e4b0 100644 --- a/src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.ml +++ b/src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.ml @@ -80,8 +80,7 @@ let collect_error_locations errs = | Environment.Ecoproto_error ( Ill_formed_type (_, _, _) | No_such_entrypoint _ | Duplicate_entrypoint _ - | Unreachable_entrypoint _ - | Runtime_contract_error (_, _) + | Unreachable_entrypoint _ | Runtime_contract_error _ | Michelson_v1_primitives.Invalid_primitive_name (_, _) | Ill_typed_data (_, _, _) | Ill_typed_contract (_, _) ) @@ -124,6 +123,42 @@ let collect_error_locations errs = in collect [] errs +(* Error raised while fetching the script of a contract for error reporting when the script is not found. *) +type error += Fetch_script_not_found_meta_error of Contract.t + +(* Errors raised while fetching the script of a contract for error reporting. *) +type error += Fetch_script_meta_error of error trace + +let fetch_script (cctxt : #Protocol_client_context.rpc_context) ~chain ~block + contract = + Plugin.RPC.Contract.get_script_normalized + cctxt + (chain, block) + ~unparsing_mode:Readable + ~contract + >>=? function + | None -> fail (Fetch_script_not_found_meta_error contract) + | Some {code; storage = _} -> + Lwt.return @@ Environment.wrap_tzresult @@ Script_repr.force_decode code + +type error += + | Rich_runtime_contract_error of Contract.t * Michelson_v1_parser.parsed + +let enrich_runtime_errors cctxt ~chain ~block ~parsed = + List.map_s (function + | Environment.Ecoproto_error (Runtime_contract_error contract) -> ( + (* If we know the script already, we don't fetch it *) + match parsed with + | Some parsed -> + Lwt.return @@ Rich_runtime_contract_error (contract, parsed) + | None -> ( + fetch_script cctxt ~chain ~block contract >|= function + | Ok script -> + let parsed = Michelson_v1_printer.unparse_toplevel script in + Rich_runtime_contract_error (contract, parsed) + | Error err -> Fetch_script_meta_error err)) + | e -> Lwt.return e) + let report_errors ~details ~show_source ?parsed ppf errs = let rec print_trace locations errs = let print_loc ppf loc = @@ -322,14 +357,15 @@ let report_errors ~details ~show_source ?parsed ppf errs = loc ; if rest <> [] then Format.fprintf ppf "@," ; print_trace locations rest - | Environment.Ecoproto_error (Runtime_contract_error (contract, expr)) - :: rest -> - let parsed = - match parsed with - | Some parsed when expr = parsed.Michelson_v1_parser.expanded -> - parsed - | Some _ | None -> Michelson_v1_printer.unparse_toplevel expr - in + | Environment.Ecoproto_error (Runtime_contract_error contract) :: rest -> + Format.fprintf + ppf + "@[Runtime error in unknown contract %a@]" + Contract.pp + contract ; + if rest <> [] then Format.fprintf ppf "@," ; + print_trace locations rest + | Rich_runtime_contract_error (contract, parsed) :: rest -> let hilights = collect_error_locations rest in Format.fprintf ppf diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.mli similarity index 89% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.mli index e1bbea6eb12cea8b035809cb0a27c7bc592adc74..1d3df5de4b1bbc7429ed6999490c6f7582f7f0a1 100644 --- a/src/proto_012_PsiThaCa/lib_client/michelson_v1_error_reporter.mli +++ b/src/proto_012_Psithaca/lib_client/michelson_v1_error_reporter.mli @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +val enrich_runtime_errors : + #Protocol_client_context.rpc_context -> + chain:Shell_services.chain -> + block:Shell_services.block -> + parsed:Michelson_v1_parser.parsed option -> + Error_monad.error list -> + Error_monad.error list Lwt.t + val report_errors : details:bool -> show_source:bool -> diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_helpers.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_helpers.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_macros.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_macros.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_macros.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_macros.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_macros.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_macros.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_macros.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_macros.mli diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_parser.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_parser.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_parser.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_parser.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_parser.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_parser.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_parser.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_parser.mli diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_printer.ml b/src/proto_012_Psithaca/lib_client/michelson_v1_printer.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_printer.ml rename to src/proto_012_Psithaca/lib_client/michelson_v1_printer.ml diff --git a/src/proto_012_PsiThaCa/lib_client/michelson_v1_printer.mli b/src/proto_012_Psithaca/lib_client/michelson_v1_printer.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/michelson_v1_printer.mli rename to src/proto_012_Psithaca/lib_client/michelson_v1_printer.mli diff --git a/src/proto_012_PsiThaCa/lib_client/mockup.ml b/src/proto_012_Psithaca/lib_client/mockup.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/mockup.ml rename to src/proto_012_Psithaca/lib_client/mockup.ml diff --git a/src/proto_012_PsiThaCa/lib_client/operation_result.ml b/src/proto_012_Psithaca/lib_client/operation_result.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/operation_result.ml rename to src/proto_012_Psithaca/lib_client/operation_result.ml diff --git a/src/proto_012_PsiThaCa/lib_client/operation_result.mli b/src/proto_012_Psithaca/lib_client/operation_result.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/operation_result.mli rename to src/proto_012_Psithaca/lib_client/operation_result.mli diff --git a/src/proto_012_PsiThaCa/lib_client/protocol_client_context.ml b/src/proto_012_Psithaca/lib_client/protocol_client_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/protocol_client_context.ml rename to src/proto_012_Psithaca/lib_client/protocol_client_context.ml diff --git a/src/proto_012_PsiThaCa/lib_client/proxy.ml b/src/proto_012_Psithaca/lib_client/proxy.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/proxy.ml rename to src/proto_012_Psithaca/lib_client/proxy.ml diff --git a/src/proto_012_PsiThaCa/lib_client/test/.ocamlformat b/src/proto_012_Psithaca/lib_client/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/.ocamlformat rename to src/proto_012_Psithaca/lib_client/test/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_client/test/assert.ml b/src/proto_012_Psithaca/lib_client/test/assert.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/assert.ml rename to src/proto_012_Psithaca/lib_client/test/assert.ml diff --git a/src/proto_012_PsiThaCa/lib_client/test/dune b/src/proto_012_Psithaca/lib_client/test/dune similarity index 67% rename from src/proto_012_PsiThaCa/lib_client/test/dune rename to src/proto_012_Psithaca/lib_client/test/dune index 189ac793a8c9104563e35e2c9fadf895c4c74b62..8279641d2fa905d3774f437677ac69bb3ecd3e7e 100644 --- a/src/proto_012_PsiThaCa/lib_client/test/dune +++ b/src/proto_012_Psithaca/lib_client/test/dune @@ -2,16 +2,16 @@ (names test_michelson_v1_macros test_client_proto_contracts test_client_proto_context test_proxy) (libraries tezos-base tezos-micheline - tezos-protocol-012-PsiThaCa - tezos-client-012-PsiThaCa + tezos-protocol-012-Psithaca + tezos-client-012-Psithaca tezos-base-test-helpers tezos-test-helpers alcotest-lwt qcheck-alcotest) - (package tezos-client-012-PsiThaCa) + (package tezos-client-012-Psithaca) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_micheline - -open Tezos_client_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa + -open Tezos_client_012_Psithaca + -open Tezos_protocol_012_Psithaca -open Tezos_base_test_helpers -open Lib_test))) diff --git a/src/proto_012_PsiThaCa/lib_client/test/test_client_proto_context.ml b/src/proto_012_Psithaca/lib_client/test/test_client_proto_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/test_client_proto_context.ml rename to src/proto_012_Psithaca/lib_client/test/test_client_proto_context.ml diff --git a/src/proto_012_PsiThaCa/lib_client/test/test_client_proto_contracts.ml b/src/proto_012_Psithaca/lib_client/test/test_client_proto_contracts.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/test_client_proto_contracts.ml rename to src/proto_012_Psithaca/lib_client/test/test_client_proto_contracts.ml diff --git a/src/proto_012_PsiThaCa/lib_client/test/test_michelson_v1_macros.ml b/src/proto_012_Psithaca/lib_client/test/test_michelson_v1_macros.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/test_michelson_v1_macros.ml rename to src/proto_012_Psithaca/lib_client/test/test_michelson_v1_macros.ml diff --git a/src/proto_012_PsiThaCa/lib_client/test/test_proxy.ml b/src/proto_012_Psithaca/lib_client/test/test_proxy.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client/test/test_proxy.ml rename to src/proto_012_Psithaca/lib_client/test/test_proxy.ml diff --git a/src/proto_012_PsiThaCa/lib_client/tezos-client-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_client/tezos-client-012-Psithaca.opam similarity index 87% rename from src/proto_012_PsiThaCa/lib_client/tezos-client-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_client/tezos-client-012-Psithaca.opam index 461dbca438c97fbdd686e1854f9ce4b8b66c6e66..3c3691b1606b079ab8665184870b32258d625718 100644 --- a/src/proto_012_PsiThaCa/lib_client/tezos-client-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_client/tezos-client-012-Psithaca.opam @@ -9,14 +9,14 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-client-base-unix" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" - "tezos-protocol-012-PsiThaCa-parameters" - "tezos-protocol-plugin-012-PsiThaCa" + "tezos-protocol-012-Psithaca-parameters" + "tezos-protocol-plugin-012-Psithaca" "alcotest-lwt" { with-test & >= "1.1.0" } "tezos-test-helpers" { with-test } "tezos-base-test-helpers" { with-test } diff --git a/src/proto_012_PsiThaCa/lib_client_commands/.ocamlformat b/src/proto_012_Psithaca/lib_client_commands/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/.ocamlformat rename to src/proto_012_Psithaca/lib_client_commands/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_client_commands/alpha_commands_registration.ml b/src/proto_012_Psithaca/lib_client_commands/alpha_commands_registration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/alpha_commands_registration.ml rename to src/proto_012_Psithaca/lib_client_commands/alpha_commands_registration.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_context_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_context_commands.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_context_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_context_commands.ml index 65729e330f1c1fc6d9b78626ebda25866021ff5b..9160af25f32433cda64259b49a62d8e9f7790cf8 100644 --- a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_context_commands.ml +++ b/src/proto_012_Psithaca/lib_client_commands/client_proto_context_commands.ml @@ -35,8 +35,15 @@ let encrypted_switch = Clic.switch ~long:"encrypted" ~doc:"encrypt the key on-disk" () let report_michelson_errors ?(no_print_source = false) ~msg - (cctxt : #Client_context.printer) = function + (cctxt : #Client_context.full) = function | Error errs -> + Michelson_v1_error_reporter.enrich_runtime_errors + cctxt + ~chain:cctxt#chain + ~block:cctxt#block + ~parsed:None + errs + >>= fun errs -> cctxt#warning "%a" (Michelson_v1_error_reporter.report_errors diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_contracts_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_contracts_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_contracts_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_contracts_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_fa12_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_fa12_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_fa12_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_fa12_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_mockup_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_mockup_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_mockup_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_mockup_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_mockup_commands.mli b/src/proto_012_Psithaca/lib_client_commands/client_proto_mockup_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_mockup_commands.mli rename to src/proto_012_Psithaca/lib_client_commands/client_proto_mockup_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_multisig_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_multisig_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_multisig_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_multisig_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_multisig_commands.mli b/src/proto_012_Psithaca/lib_client_commands/client_proto_multisig_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_multisig_commands.mli rename to src/proto_012_Psithaca/lib_client_commands/client_proto_multisig_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_programs_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_programs_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_programs_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_programs_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_programs_commands.mli b/src/proto_012_Psithaca/lib_client_commands/client_proto_programs_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_programs_commands.mli rename to src/proto_012_Psithaca/lib_client_commands/client_proto_programs_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_stresstest_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_stresstest_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_stresstest_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_stresstest_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_utils_commands.ml b/src/proto_012_Psithaca/lib_client_commands/client_proto_utils_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_utils_commands.ml rename to src/proto_012_Psithaca/lib_client_commands/client_proto_utils_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_commands/client_proto_utils_commands.mli b/src/proto_012_Psithaca/lib_client_commands/client_proto_utils_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/client_proto_utils_commands.mli rename to src/proto_012_Psithaca/lib_client_commands/client_proto_utils_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune similarity index 56% rename from src/proto_012_PsiThaCa/lib_client_commands/dune rename to src/proto_012_Psithaca/lib_client_commands/dune index 25a169f2f9b5cb9665bbdb5f9c6ec8565f251d7c..3e77fdb21967d1d215209edeff9373a328c8e3f9 100644 --- a/src/proto_012_PsiThaCa/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -1,57 +1,57 @@ (library - (name tezos_client_012_PsiThaCa_commands) + (name tezos_client_012_Psithaca_commands) (instrumentation (backend bisect_ppx)) - (public_name tezos-client-012-PsiThaCa-commands) + (public_name tezos-client-012-Psithaca-commands) (libraries tezos-base tezos-stdlib-unix - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base-unix - tezos-client-012-PsiThaCa + tezos-client-012-Psithaca tezos-client-commands tezos-rpc - tezos-protocol-plugin-012-PsiThaCa) + tezos-protocol-plugin-012-Psithaca) (library_flags (:standard -linkall)) (modules (:standard \ alpha_commands_registration)) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -open Tezos_stdlib_unix -open Tezos_shell_services -open Tezos_client_base - -open Tezos_client_012_PsiThaCa + -open Tezos_client_012_Psithaca -open Tezos_client_commands -open Tezos_rpc -open Tezos_client_base_unix - -open Tezos_protocol_plugin_012_PsiThaCa))) + -open Tezos_protocol_plugin_012_Psithaca))) (library - (name tezos_client_012_PsiThaCa_commands_registration) + (name tezos_client_012_Psithaca_commands_registration) (instrumentation (backend bisect_ppx)) - (public_name tezos-client-012-PsiThaCa-commands-registration) + (public_name tezos-client-012-Psithaca-commands-registration) (libraries tezos-base - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services tezos-client-base - tezos-client-012-PsiThaCa + tezos-client-012-Psithaca tezos-client-commands - tezos-client-012-PsiThaCa-commands - tezos-client-sapling-012-PsiThaCa + tezos-client-012-Psithaca-commands + tezos-client-sapling-012-Psithaca tezos-rpc - tezos-protocol-plugin-012-PsiThaCa) + tezos-protocol-plugin-012-Psithaca) (library_flags (:standard -linkall)) (modules alpha_commands_registration) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -open Tezos_shell_services -open Tezos_client_base - -open Tezos_client_012_PsiThaCa + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_client_012_PsiThaCa_commands - -open Tezos_client_sapling_012_PsiThaCa + -open Tezos_client_012_Psithaca_commands + -open Tezos_client_sapling_012_Psithaca -open Tezos_rpc - -open Tezos_protocol_plugin_012_PsiThaCa))) + -open Tezos_protocol_plugin_012_Psithaca))) diff --git a/src/proto_012_PsiThaCa/lib_client_commands/dune-project b/src/proto_012_Psithaca/lib_client_commands/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_commands/dune-project rename to src/proto_012_Psithaca/lib_client_commands/dune-project diff --git a/src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands-registration.opam b/src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands-registration.opam similarity index 80% rename from src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands-registration.opam rename to src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands-registration.opam index 17660271d7259bc990681522e2b889785e3dcf3d..8e3fc05d6a6aa4dcdafeaa4446f1ef189f9dbe79 100644 --- a/src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands-registration.opam +++ b/src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands-registration.opam @@ -9,12 +9,12 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-client-base" - "tezos-client-012-PsiThaCa" - "tezos-client-012-PsiThaCa-commands" - "tezos-client-sapling-012-PsiThaCa" + "tezos-client-012-Psithaca" + "tezos-client-012-Psithaca-commands" + "tezos-client-sapling-012-Psithaca" "tezos-client-commands" ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands.opam b/src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands.opam similarity index 90% rename from src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands.opam rename to src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands.opam index fd9bfbb057adc8ca8f512ee8608460e78d3f935e..5ebf12cdbf2a0fe97d5d64f86fdb4b797301b80e 100644 --- a/src/proto_012_PsiThaCa/lib_client_commands/tezos-client-012-PsiThaCa-commands.opam +++ b/src/proto_012_Psithaca/lib_client_commands/tezos-client-012-Psithaca-commands.opam @@ -9,10 +9,10 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-client-base-unix" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-client-commands" ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/.ocamlformat b/src/proto_012_Psithaca/lib_client_sapling/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/.ocamlformat rename to src/proto_012_Psithaca/lib_client_sapling/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/client_sapling_commands.ml b/src/proto_012_Psithaca/lib_client_sapling/client_sapling_commands.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/client_sapling_commands.ml rename to src/proto_012_Psithaca/lib_client_sapling/client_sapling_commands.ml diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/client_sapling_commands.mli b/src/proto_012_Psithaca/lib_client_sapling/client_sapling_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/client_sapling_commands.mli rename to src/proto_012_Psithaca/lib_client_sapling/client_sapling_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/context.ml b/src/proto_012_Psithaca/lib_client_sapling/context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/context.ml rename to src/proto_012_Psithaca/lib_client_sapling/context.ml diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/context.mli b/src/proto_012_Psithaca/lib_client_sapling/context.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/context.mli rename to src/proto_012_Psithaca/lib_client_sapling/context.mli diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune new file mode 100644 index 0000000000000000000000000000000000000000..5167b00e13905b8bf6efd3b55b79c6f43a6dd7d7 --- /dev/null +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -0,0 +1,19 @@ +(library + (name tezos_client_sapling_012_Psithaca) + (instrumentation (backend bisect_ppx)) + (public_name tezos-client-sapling-012-Psithaca) + (libraries tezos-base + tezos-crypto + tezos-client-base + tezos-signer-backends + tezos-client-012-Psithaca + tezos-client-012-Psithaca-commands + tezos-protocol-012-Psithaca) + (library_flags (:standard -linkall)) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_stdlib_unix + -open Tezos_client_base + -open Tezos_client_012_Psithaca + -open Tezos_client_012_Psithaca_commands + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca))) diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/dune-project b/src/proto_012_Psithaca/lib_client_sapling/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/dune-project rename to src/proto_012_Psithaca/lib_client_sapling/dune-project diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/tezos-client-sapling-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_client_sapling/tezos-client-sapling-012-Psithaca.opam similarity index 84% rename from src/proto_012_PsiThaCa/lib_client_sapling/tezos-client-sapling-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_client_sapling/tezos-client-sapling-012-Psithaca.opam index e9c7916bdddb7cf7f110c1c067fe4d2b13a5a94e..c676182a69818c2ca2dfa9a7f0a2fa1acfbf2d08 100644 --- a/src/proto_012_PsiThaCa/lib_client_sapling/tezos-client-sapling-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_client_sapling/tezos-client-sapling-012-Psithaca.opam @@ -13,9 +13,9 @@ depends: [ "tezos-crypto" "tezos-client-base" "tezos-signer-backends" - "tezos-client-012-PsiThaCa" - "tezos-client-012-PsiThaCa-commands" - "tezos-protocol-012-PsiThaCa" + "tezos-client-012-Psithaca" + "tezos-client-012-Psithaca-commands" + "tezos-protocol-012-Psithaca" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/wallet.ml b/src/proto_012_Psithaca/lib_client_sapling/wallet.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/wallet.ml rename to src/proto_012_Psithaca/lib_client_sapling/wallet.ml diff --git a/src/proto_012_PsiThaCa/lib_client_sapling/wallet.mli b/src/proto_012_Psithaca/lib_client_sapling/wallet.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_client_sapling/wallet.mli rename to src/proto_012_Psithaca/lib_client_sapling/wallet.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/.ocamlformat b/src/proto_012_Psithaca/lib_delegate/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/.ocamlformat rename to src/proto_012_Psithaca/lib_delegate/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_delegate/abstract_context_index.ml b/src/proto_012_Psithaca/lib_delegate/abstract_context_index.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/abstract_context_index.ml rename to src/proto_012_Psithaca/lib_delegate/abstract_context_index.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/abstract_context_index.mli b/src/proto_012_Psithaca/lib_delegate/abstract_context_index.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/abstract_context_index.mli rename to src/proto_012_Psithaca/lib_delegate/abstract_context_index.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_actions.ml b/src/proto_012_Psithaca/lib_delegate/baking_actions.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_actions.ml rename to src/proto_012_Psithaca/lib_delegate/baking_actions.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_actions.mli b/src/proto_012_Psithaca/lib_delegate/baking_actions.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_actions.mli rename to src/proto_012_Psithaca/lib_delegate/baking_actions.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_cache.ml b/src/proto_012_Psithaca/lib_delegate/baking_cache.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_cache.ml rename to src/proto_012_Psithaca/lib_delegate/baking_cache.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_commands.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_delegate/baking_commands.ml rename to src/proto_012_Psithaca/lib_delegate/baking_commands.ml index c6658ec72474ae685b1c313de282526b8b0ea32a..04dea37737f28eea49b41289e18884718abfdf72 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/baking_commands.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml @@ -87,7 +87,7 @@ let operations_arg = "When specified, the baker will try to fetch operations from this \ file (or uri) and to include retrieved operations in the block. The \ expected format of the contents is a list of operations [ \ - 012-PsiThaCa.operation ]. Environment variable '%s' may also be \ + 012-Psithaca.operation ]. Environment variable '%s' may also be \ specified to add headers to the requests (only 'host' headers are \ supported). If the resource cannot be retrieved, e.g., if the file \ is absent, unreadable, or the web service returns a 404 error, the \ diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_commands.mli b/src/proto_012_Psithaca/lib_delegate/baking_commands.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_commands.mli rename to src/proto_012_Psithaca/lib_delegate/baking_commands.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_commands_registration.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_commands_registration.ml rename to src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_configuration.ml b/src/proto_012_Psithaca/lib_delegate/baking_configuration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_configuration.ml rename to src/proto_012_Psithaca/lib_delegate/baking_configuration.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_configuration.mli b/src/proto_012_Psithaca/lib_delegate/baking_configuration.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_configuration.mli rename to src/proto_012_Psithaca/lib_delegate/baking_configuration.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_errors.ml b/src/proto_012_Psithaca/lib_delegate/baking_errors.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_errors.ml rename to src/proto_012_Psithaca/lib_delegate/baking_errors.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_events.ml b/src/proto_012_Psithaca/lib_delegate/baking_events.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_events.ml rename to src/proto_012_Psithaca/lib_delegate/baking_events.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_files.ml b/src/proto_012_Psithaca/lib_delegate/baking_files.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_files.ml rename to src/proto_012_Psithaca/lib_delegate/baking_files.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_files.mli b/src/proto_012_Psithaca/lib_delegate/baking_files.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_files.mli rename to src/proto_012_Psithaca/lib_delegate/baking_files.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_highwatermarks.ml b/src/proto_012_Psithaca/lib_delegate/baking_highwatermarks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_highwatermarks.ml rename to src/proto_012_Psithaca/lib_delegate/baking_highwatermarks.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_highwatermarks.mli b/src/proto_012_Psithaca/lib_delegate/baking_highwatermarks.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_highwatermarks.mli rename to src/proto_012_Psithaca/lib_delegate/baking_highwatermarks.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_lib.ml b/src/proto_012_Psithaca/lib_delegate/baking_lib.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_lib.ml rename to src/proto_012_Psithaca/lib_delegate/baking_lib.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_lib.mli b/src/proto_012_Psithaca/lib_delegate/baking_lib.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_lib.mli rename to src/proto_012_Psithaca/lib_delegate/baking_lib.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_nonces.ml b/src/proto_012_Psithaca/lib_delegate/baking_nonces.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_nonces.ml rename to src/proto_012_Psithaca/lib_delegate/baking_nonces.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_nonces.mli b/src/proto_012_Psithaca/lib_delegate/baking_nonces.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_nonces.mli rename to src/proto_012_Psithaca/lib_delegate/baking_nonces.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_pow.ml b/src/proto_012_Psithaca/lib_delegate/baking_pow.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_pow.ml rename to src/proto_012_Psithaca/lib_delegate/baking_pow.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_pow.mli b/src/proto_012_Psithaca/lib_delegate/baking_pow.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_pow.mli rename to src/proto_012_Psithaca/lib_delegate/baking_pow.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_scheduling.ml b/src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_scheduling.ml rename to src/proto_012_Psithaca/lib_delegate/baking_scheduling.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_scheduling.mli b/src/proto_012_Psithaca/lib_delegate/baking_scheduling.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_scheduling.mli rename to src/proto_012_Psithaca/lib_delegate/baking_scheduling.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_simulator.ml b/src/proto_012_Psithaca/lib_delegate/baking_simulator.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_simulator.ml rename to src/proto_012_Psithaca/lib_delegate/baking_simulator.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_simulator.mli b/src/proto_012_Psithaca/lib_delegate/baking_simulator.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_simulator.mli rename to src/proto_012_Psithaca/lib_delegate/baking_simulator.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_state.ml b/src/proto_012_Psithaca/lib_delegate/baking_state.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_state.ml rename to src/proto_012_Psithaca/lib_delegate/baking_state.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/baking_state.mli b/src/proto_012_Psithaca/lib_delegate/baking_state.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/baking_state.mli rename to src/proto_012_Psithaca/lib_delegate/baking_state.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/block_forge.ml b/src/proto_012_Psithaca/lib_delegate/block_forge.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/block_forge.ml rename to src/proto_012_Psithaca/lib_delegate/block_forge.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/block_forge.mli b/src/proto_012_Psithaca/lib_delegate/block_forge.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/block_forge.mli rename to src/proto_012_Psithaca/lib_delegate/block_forge.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_blocks.ml b/src/proto_012_Psithaca/lib_delegate/client_baking_blocks.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_blocks.ml rename to src/proto_012_Psithaca/lib_delegate/client_baking_blocks.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_blocks.mli b/src/proto_012_Psithaca/lib_delegate/client_baking_blocks.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_blocks.mli rename to src/proto_012_Psithaca/lib_delegate/client_baking_blocks.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_denunciation.ml b/src/proto_012_Psithaca/lib_delegate/client_baking_denunciation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_denunciation.ml rename to src/proto_012_Psithaca/lib_delegate/client_baking_denunciation.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_denunciation.mli b/src/proto_012_Psithaca/lib_delegate/client_baking_denunciation.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_denunciation.mli rename to src/proto_012_Psithaca/lib_delegate/client_baking_denunciation.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_scheduling.ml b/src/proto_012_Psithaca/lib_delegate/client_baking_scheduling.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_scheduling.ml rename to src/proto_012_Psithaca/lib_delegate/client_baking_scheduling.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_baking_scheduling.mli b/src/proto_012_Psithaca/lib_delegate/client_baking_scheduling.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_baking_scheduling.mli rename to src/proto_012_Psithaca/lib_delegate/client_baking_scheduling.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_daemon.ml b/src/proto_012_Psithaca/lib_delegate/client_daemon.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_daemon.ml rename to src/proto_012_Psithaca/lib_delegate/client_daemon.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/client_daemon.mli b/src/proto_012_Psithaca/lib_delegate/client_daemon.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/client_daemon.mli rename to src/proto_012_Psithaca/lib_delegate/client_daemon.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/context_ops.ml b/src/proto_012_Psithaca/lib_delegate/context_ops.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/context_ops.ml rename to src/proto_012_Psithaca/lib_delegate/context_ops.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/delegate_events.ml b/src/proto_012_Psithaca/lib_delegate/delegate_events.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/delegate_events.ml rename to src/proto_012_Psithaca/lib_delegate/delegate_events.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/dune b/src/proto_012_Psithaca/lib_delegate/dune similarity index 64% rename from src/proto_012_PsiThaCa/lib_delegate/dune rename to src/proto_012_Psithaca/lib_delegate/dune index 17664ec3147f853fd369014c798acec580cb3045..45399c741f9e7c6ca69ff76fb5305fb3554fd121 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/dune +++ b/src/proto_012_Psithaca/lib_delegate/dune @@ -1,15 +1,15 @@ (library - (name tezos_baking_012_PsiThaCa) + (name tezos_baking_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-baking-012-PsiThaCa) + (public_name tezos-baking-012-Psithaca) (libraries tezos-base tezos-version - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-context tezos-shell-services tezos-client-base - tezos-client-012-PsiThaCa + tezos-client-012-Psithaca tezos-client-commands tezos-stdlib tezos-stdlib-unix @@ -25,11 +25,11 @@ baking_commands baking_commands_registration)) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_plugin_012_PsiThaCa + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_plugin_012_Psithaca -open Tezos_shell_services -open Tezos_client_base - -open Tezos_client_012_PsiThaCa + -open Tezos_client_012_Psithaca -open Tezos_client_commands -open Tezos_stdlib -open Tezos_stdlib_unix @@ -39,51 +39,51 @@ -open Tezos_rpc_http))) (library - (name tezos_baking_012_PsiThaCa_commands) + (name tezos_baking_012_Psithaca_commands) (instrumentation (backend bisect_ppx)) - (public_name tezos-baking-012-PsiThaCa-commands) + (public_name tezos-baking-012-Psithaca-commands) (libraries tezos-base - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services tezos-client-base - tezos-client-012-PsiThaCa + tezos-client-012-Psithaca tezos-client-commands - tezos-baking-012-PsiThaCa) + tezos-baking-012-Psithaca) (library_flags (:standard -linkall)) (modules baking_commands) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -open Tezos_stdlib_unix -open Tezos_shell_services -open Tezos_client_base - -open Tezos_client_012_PsiThaCa + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_baking_012_PsiThaCa + -open Tezos_baking_012_Psithaca -open Tezos_rpc))) (library - (name tezos_baking_012_PsiThaCa_commands_registration) + (name tezos_baking_012_Psithaca_commands_registration) (instrumentation (backend bisect_ppx)) - (public_name tezos-baking-012-PsiThaCa-commands.registration) + (public_name tezos-baking-012-Psithaca-commands.registration) (libraries tezos-base - tezos-protocol-012-PsiThaCa + tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services tezos-client-base - tezos-client-012-PsiThaCa + tezos-client-012-Psithaca tezos-client-commands - tezos-baking-012-PsiThaCa - tezos-baking-012-PsiThaCa-commands + tezos-baking-012-Psithaca + tezos-baking-012-Psithaca-commands tezos-rpc) (library_flags (:standard -linkall)) (modules baking_commands_registration) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -open Tezos_shell_services -open Tezos_client_base - -open Tezos_client_012_PsiThaCa + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_baking_012_PsiThaCa - -open Tezos_baking_012_PsiThaCa_commands + -open Tezos_baking_012_Psithaca + -open Tezos_baking_012_Psithaca_commands -open Tezos_rpc))) diff --git a/src/proto_012_PsiThaCa/lib_delegate/dune-project b/src/proto_012_Psithaca/lib_delegate/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/dune-project rename to src/proto_012_Psithaca/lib_delegate/dune-project diff --git a/src/proto_012_PsiThaCa/lib_delegate/liquidity_baking_vote_file.ml b/src/proto_012_Psithaca/lib_delegate/liquidity_baking_vote_file.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/liquidity_baking_vote_file.ml rename to src/proto_012_Psithaca/lib_delegate/liquidity_baking_vote_file.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/logging.ml b/src/proto_012_Psithaca/lib_delegate/logging.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/logging.ml rename to src/proto_012_Psithaca/lib_delegate/logging.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/logging.mli b/src/proto_012_Psithaca/lib_delegate/logging.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/logging.mli rename to src/proto_012_Psithaca/lib_delegate/logging.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/node_rpc.ml b/src/proto_012_Psithaca/lib_delegate/node_rpc.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/node_rpc.ml rename to src/proto_012_Psithaca/lib_delegate/node_rpc.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/node_rpc.mli b/src/proto_012_Psithaca/lib_delegate/node_rpc.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/node_rpc.mli rename to src/proto_012_Psithaca/lib_delegate/node_rpc.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_pool.ml b/src/proto_012_Psithaca/lib_delegate/operation_pool.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_pool.ml rename to src/proto_012_Psithaca/lib_delegate/operation_pool.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_pool.mli b/src/proto_012_Psithaca/lib_delegate/operation_pool.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_pool.mli rename to src/proto_012_Psithaca/lib_delegate/operation_pool.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_selection.ml b/src/proto_012_Psithaca/lib_delegate/operation_selection.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_selection.ml rename to src/proto_012_Psithaca/lib_delegate/operation_selection.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_selection.mli b/src/proto_012_Psithaca/lib_delegate/operation_selection.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_selection.mli rename to src/proto_012_Psithaca/lib_delegate/operation_selection.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_worker.ml b/src/proto_012_Psithaca/lib_delegate/operation_worker.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_worker.ml rename to src/proto_012_Psithaca/lib_delegate/operation_worker.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/operation_worker.mli b/src/proto_012_Psithaca/lib_delegate/operation_worker.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/operation_worker.mli rename to src/proto_012_Psithaca/lib_delegate/operation_worker.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/state_transitions.ml b/src/proto_012_Psithaca/lib_delegate/state_transitions.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/state_transitions.ml rename to src/proto_012_Psithaca/lib_delegate/state_transitions.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/state_transitions.mli b/src/proto_012_Psithaca/lib_delegate/state_transitions.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/state_transitions.mli rename to src/proto_012_Psithaca/lib_delegate/state_transitions.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/.ocamlformat b/src/proto_012_Psithaca/lib_delegate/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/.ocamlformat rename to src/proto_012_Psithaca/lib_delegate/test/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/README.md b/src/proto_012_Psithaca/lib_delegate/test/README.md similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/README.md rename to src/proto_012_Psithaca/lib_delegate/test/README.md diff --git a/src/proto_012_Psithaca/lib_delegate/test/dune b/src/proto_012_Psithaca/lib_delegate/test/dune new file mode 100644 index 0000000000000000000000000000000000000000..5ebd6390ceccef5bf74827ac0c67ea98bf35a4f4 --- /dev/null +++ b/src/proto_012_Psithaca/lib_delegate/test/dune @@ -0,0 +1,25 @@ +(test + (name main) + (package tezos-baking-012-Psithaca) + (libraries + tezos-client-012-Psithaca + tezos_baking_012_Psithaca + tezos-baking-012-Psithaca.mockup-simulator + tezos-base-test-helpers + tezos-protocol-012-Psithaca-parameters + tezos-crypto + alcotest-lwt) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_micheline + -open Tezos_client_012_Psithaca + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca + -open Tezos_base_test_helpers + -open Tezos_012_Psithaca_mockup_simulator + -open Tezos_baking_012_Psithaca)) + (action (run %{exe:main.exe} -q -e))) + +(rule + (alias runtest_lint) + (deps (glob_files *.ml{,i})) + (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/main.ml b/src/proto_012_Psithaca/lib_delegate/test/main.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/main.ml rename to src/proto_012_Psithaca/lib_delegate/test/main.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/.ocamlformat b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/.ocamlformat rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/broadcast_services.ml b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/broadcast_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/broadcast_services.ml rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/broadcast_services.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/dune b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune similarity index 50% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/dune rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune index c02523877354173315aa93676e0e075a4e73358b..303585d0ec88b2fa60a62033e618077d8282829f 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune @@ -1,22 +1,22 @@ (library - (name tezos_012_PsiThaCa_mockup_simulator) - (public_name tezos-baking-012-PsiThaCa.mockup-simulator) + (name tezos_012_Psithaca_mockup_simulator) + (public_name tezos-baking-012-Psithaca.mockup-simulator) (libraries tezos-client-base-unix tezos-client-commands - tezos-protocol-012-PsiThaCa - tezos-baking-012-PsiThaCa + tezos-protocol-012-Psithaca + tezos-baking-012-Psithaca tezos-mockup tezos-mockup-proxy tezos-mockup-commands) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa - -open Tezos_client_012_PsiThaCa + -open Tezos_protocol_012_Psithaca + -open Tezos_client_012_Psithaca -open Tezos_client_commands - -open Tezos_baking_012_PsiThaCa + -open Tezos_baking_012_Psithaca -open Tezos_stdlib_unix -open Tezos_client_base_unix - -open Tezos_protocol_012_PsiThaCa_parameters - -open Tezos_protocol_012_PsiThaCa.Protocol))) + -open Tezos_protocol_012_Psithaca_parameters + -open Tezos_protocol_012_Psithaca.Protocol))) (rule (alias runtest_lint) diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_client_context.ml b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_client_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_client_context.ml rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_client_context.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_daemon.ml b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_daemon.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_daemon.ml rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_daemon.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_services.ml b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/faked_services.ml rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/faked_services.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/mockup_simulator.ml b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/mockup_simulator.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/mockup_simulator.ml rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/mockup_simulator.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/mockup_simulator.mli b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/mockup_simulator.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/mockup_simulator/mockup_simulator.mli rename to src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/mockup_simulator.mli diff --git a/src/proto_012_PsiThaCa/lib_delegate/test/test_scenario.ml b/src/proto_012_Psithaca/lib_delegate/test/test_scenario.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_delegate/test/test_scenario.ml rename to src/proto_012_Psithaca/lib_delegate/test/test_scenario.ml diff --git a/src/proto_012_PsiThaCa/lib_delegate/tezos-accuser-012-PsiThaCa-commands.opam b/src/proto_012_Psithaca/lib_delegate/tezos-accuser-012-Psithaca-commands.opam similarity index 86% rename from src/proto_012_PsiThaCa/lib_delegate/tezos-accuser-012-PsiThaCa-commands.opam rename to src/proto_012_Psithaca/lib_delegate/tezos-accuser-012-Psithaca-commands.opam index a24ab4a5525ddc96c327eea9313d103096897604..13b45e6cace9e26f74db0384a4e20defffb681fb 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/tezos-accuser-012-PsiThaCa-commands.opam +++ b/src/proto_012_Psithaca/lib_delegate/tezos-accuser-012-Psithaca-commands.opam @@ -9,12 +9,12 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-client-base" "tezos-client-commands" - "tezos-client-012-PsiThaCa" - "tezos-baking-012-PsiThaCa" + "tezos-client-012-Psithaca" + "tezos-baking-012-Psithaca" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa-commands.opam b/src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca-commands.opam similarity index 86% rename from src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa-commands.opam rename to src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca-commands.opam index ab64e9f28769c17f169fa241972cda37f52fa970..60d43fb96f69a267f3fc1db7df9569af816d7f9c 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa-commands.opam +++ b/src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca-commands.opam @@ -9,13 +9,13 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-shell-context" "tezos-client-base" "tezos-client-commands" - "tezos-client-012-PsiThaCa" - "tezos-baking-012-PsiThaCa" + "tezos-client-012-Psithaca" + "tezos-baking-012-Psithaca" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca.opam similarity index 82% rename from src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca.opam index c187df0ebf940f91e298f718ecc6fa427fd337a9..bdf3049797cccbcf672996358e579c5440b1916e 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/tezos-baking-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_delegate/tezos-baking-012-Psithaca.opam @@ -7,23 +7,23 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "tezos-012-PsiThaCa-test-helpers" { with-test } + "tezos-012-Psithaca-test-helpers" { with-test } "dune" { >= "2.9" } "tezos-base" "tezos-version" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-context" "tezos-shell-services" "tezos-context" "tezos-client-base" "tezos-client-commands" - "tezos-client-012-PsiThaCa" + "tezos-client-012-Psithaca" "tezos-rpc-http-client-unix" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "tezos-base-test-helpers" {with-test} - "tezos-protocol-012-PsiThaCa-parameters" {with-test} + "tezos-protocol-012-Psithaca-parameters" {with-test} "alcotest-lwt" {with-test} ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_delegate/tezos-endorser-012-PsiThaCa-commands.opam b/src/proto_012_Psithaca/lib_delegate/tezos-endorser-012-Psithaca-commands.opam similarity index 86% rename from src/proto_012_PsiThaCa/lib_delegate/tezos-endorser-012-PsiThaCa-commands.opam rename to src/proto_012_Psithaca/lib_delegate/tezos-endorser-012-Psithaca-commands.opam index a0fca5b806db11efbe557e82fcba84b8141821ee..4e84befc4d39b25d3be7f0fc298db6afce476617 100644 --- a/src/proto_012_PsiThaCa/lib_delegate/tezos-endorser-012-PsiThaCa-commands.opam +++ b/src/proto_012_Psithaca/lib_delegate/tezos-endorser-012-Psithaca-commands.opam @@ -9,12 +9,12 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-shell-services" "tezos-client-base" "tezos-client-commands" - "tezos-client-012-PsiThaCa" - "tezos-baking-012-PsiThaCa" + "tezos-client-012-Psithaca" + "tezos-baking-012-Psithaca" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/proto_012_PsiThaCa/lib_parameters/.ocamlformat b/src/proto_012_Psithaca/lib_parameters/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_parameters/.ocamlformat rename to src/proto_012_Psithaca/lib_parameters/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_parameters/default_parameters.ml b/src/proto_012_Psithaca/lib_parameters/default_parameters.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_parameters/default_parameters.ml rename to src/proto_012_Psithaca/lib_parameters/default_parameters.ml diff --git a/src/proto_012_PsiThaCa/lib_parameters/default_parameters.mli b/src/proto_012_Psithaca/lib_parameters/default_parameters.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_parameters/default_parameters.mli rename to src/proto_012_Psithaca/lib_parameters/default_parameters.mli diff --git a/src/proto_012_PsiThaCa/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune similarity index 70% rename from src/proto_012_PsiThaCa/lib_parameters/dune rename to src/proto_012_Psithaca/lib_parameters/dune index 60eedffa945fcbfda45d0ad292b740f245277140..a9daaead55a03f49cbe5422f63aa73757c437dfc 100644 --- a/src/proto_012_PsiThaCa/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -1,25 +1,25 @@ (library - (name tezos_protocol_012_PsiThaCa_parameters) + (name tezos_protocol_012_Psithaca_parameters) (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-012-PsiThaCa-parameters) + (public_name tezos-protocol-012-Psithaca-parameters) (modules :standard \ gen) (libraries tezos-base tezos-base.unix tezos-protocol-environment - tezos-protocol-012-PsiThaCa) + tezos-protocol-012-Psithaca) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca -linkall)) ) (executable (name gen) (libraries tezos-base - tezos-protocol-012-PsiThaCa-parameters) + tezos-protocol-012-Psithaca-parameters) (modules gen) (flags (:standard -open Tezos_base__TzPervasives - -open Tezos_protocol_012_PsiThaCa_parameters - -open Tezos_protocol_012_PsiThaCa + -open Tezos_protocol_012_Psithaca_parameters + -open Tezos_protocol_012_Psithaca -linkall))) (rule diff --git a/src/proto_012_PsiThaCa/lib_parameters/dune-project b/src/proto_012_Psithaca/lib_parameters/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_parameters/dune-project rename to src/proto_012_Psithaca/lib_parameters/dune-project diff --git a/src/proto_012_PsiThaCa/lib_parameters/gen.ml b/src/proto_012_Psithaca/lib_parameters/gen.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_parameters/gen.ml rename to src/proto_012_Psithaca/lib_parameters/gen.ml diff --git a/src/proto_012_PsiThaCa/lib_parameters/tezos-protocol-012-PsiThaCa-parameters.opam b/src/proto_012_Psithaca/lib_parameters/tezos-protocol-012-Psithaca-parameters.opam similarity index 93% rename from src/proto_012_PsiThaCa/lib_parameters/tezos-protocol-012-PsiThaCa-parameters.opam rename to src/proto_012_Psithaca/lib_parameters/tezos-protocol-012-Psithaca-parameters.opam index 9abeaecaaef3230495cfc49cd062a11a69b3a85f..b5b347cbf120253d167ce1da565e1d6af223581a 100644 --- a/src/proto_012_PsiThaCa/lib_parameters/tezos-protocol-012-PsiThaCa-parameters.opam +++ b/src/proto_012_Psithaca/lib_parameters/tezos-protocol-012-Psithaca-parameters.opam @@ -9,7 +9,7 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/proto_012_PsiThaCa/lib_plugin/.ocamlformat b/src/proto_012_Psithaca/lib_plugin/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/.ocamlformat rename to src/proto_012_Psithaca/lib_plugin/.ocamlformat diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune new file mode 100644 index 0000000000000000000000000000000000000000..b54e9d40191790823258fb57f2071b7cb6e10fcd --- /dev/null +++ b/src/proto_012_Psithaca/lib_plugin/dune @@ -0,0 +1,27 @@ +(library + (name tezos_protocol_plugin_012_Psithaca) + (instrumentation (backend bisect_ppx)) + (public_name tezos-protocol-plugin-012-Psithaca) + (libraries tezos-base + tezos-protocol-012-Psithaca + tezos-stdlib-unix + ) + (modules (:standard) \ Plugin_registerer) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_protocol_012_Psithaca + -open Tezos_stdlib_unix + ))) + +(library + (name tezos_protocol_plugin_012_Psithaca_registerer) + (instrumentation (backend bisect_ppx)) + (public_name tezos-protocol-plugin-012-Psithaca-registerer) + (libraries tezos-base + tezos-embedded-protocol-012-Psithaca + tezos-protocol-plugin-012-Psithaca + tezos-shell) + (modules Plugin_registerer) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_embedded_protocol_012_Psithaca + -open Tezos_protocol_plugin_012_Psithaca + -open Tezos_shell))) diff --git a/src/proto_012_PsiThaCa/lib_plugin/dune-project b/src/proto_012_Psithaca/lib_plugin/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/dune-project rename to src/proto_012_Psithaca/lib_plugin/dune-project diff --git a/src/proto_012_PsiThaCa/lib_plugin/plugin.ml b/src/proto_012_Psithaca/lib_plugin/plugin.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/plugin.ml rename to src/proto_012_Psithaca/lib_plugin/plugin.ml diff --git a/src/proto_012_PsiThaCa/lib_plugin/plugin_registerer.ml b/src/proto_012_Psithaca/lib_plugin/plugin_registerer.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/plugin_registerer.ml rename to src/proto_012_Psithaca/lib_plugin/plugin_registerer.ml diff --git a/src/proto_012_PsiThaCa/lib_plugin/test/.ocamlformat b/src/proto_012_Psithaca/lib_plugin/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/test/.ocamlformat rename to src/proto_012_Psithaca/lib_plugin/test/.ocamlformat diff --git a/src/proto_012_Psithaca/lib_plugin/test/dune b/src/proto_012_Psithaca/lib_plugin/test/dune new file mode 100644 index 0000000000000000000000000000000000000000..6692423622b9f959dd99711dbfb9aa6c258af49a --- /dev/null +++ b/src/proto_012_Psithaca/lib_plugin/test/dune @@ -0,0 +1,16 @@ +(test + (name test_consensus_filter) + (package tezos-protocol-plugin-012-Psithaca) + (libraries tezos-base + alcotest-lwt + tezos-test-helpers + qcheck-alcotest + tezos-stdlib-unix + tezos-protocol-012-Psithaca-parameters + tezos-protocol-plugin-012-Psithaca) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_micheline + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_plugin_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca + -open Tezos_protocol_012_Psithaca.Protocol))) diff --git a/src/proto_012_PsiThaCa/lib_plugin/test/test_consensus_filter.ml b/src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_plugin/test/test_consensus_filter.ml rename to src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml diff --git a/src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa-registerer.opam b/src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca-registerer.opam similarity index 84% rename from src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa-registerer.opam rename to src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca-registerer.opam index 7039beb4f626b6aabf094d0ca71570cf1d2be7cb..e2b3e5fcb44232514c83a0ee841c8a8c4db94b6b 100644 --- a/src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa-registerer.opam +++ b/src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -7,8 +7,8 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.9" } - "tezos-embedded-protocol-012-PsiThaCa" - "tezos-protocol-plugin-012-PsiThaCa" + "tezos-embedded-protocol-012-Psithaca" + "tezos-protocol-plugin-012-Psithaca" "tezos-shell" ] build: [ diff --git a/src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca.opam similarity index 86% rename from src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca.opam index 7f92c67bf0112db1cd9f76f7ce95f003aed13cc9..c237ac98e6517c95766f2741946c87cf66580b5e 100644 --- a/src/proto_012_PsiThaCa/lib_plugin/tezos-protocol-plugin-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_plugin/tezos-protocol-plugin-012-Psithaca.opam @@ -9,8 +9,8 @@ depends: [ "dune" { >= "2.9" } "tezos-base" "tezos-stdlib-unix" - "tezos-protocol-012-PsiThaCa" - "tezos-protocol-012-PsiThaCa-parameters" {with-test} + "tezos-protocol-012-Psithaca" + "tezos-protocol-012-Psithaca-parameters" {with-test} "tezos-test-helpers" {with-test} "alcotest-lwt" {with-test} "qcheck-alcotest" {with-test} diff --git a/src/proto_012_PsiThaCa/lib_protocol/.ocamlformat b/src/proto_012_Psithaca/lib_protocol/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/.ocamlformat rename to src/proto_012_Psithaca/lib_protocol/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_protocol/TEZOS_PROTOCOL b/src/proto_012_Psithaca/lib_protocol/TEZOS_PROTOCOL similarity index 98% rename from src/proto_012_PsiThaCa/lib_protocol/TEZOS_PROTOCOL rename to src/proto_012_Psithaca/lib_protocol/TEZOS_PROTOCOL index 575bda8a98929cbbf4d62b8a19eeb8740b96d2de..3620b9c47d895099fdfc5493e75fd5db348e10c5 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/TEZOS_PROTOCOL +++ b/src/proto_012_Psithaca/lib_protocol/TEZOS_PROTOCOL @@ -1,6 +1,6 @@ { "expected_env_version": 4, - "hash": "PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP", + "hash": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A", "modules": [ "Misc", "Non_empty_string", diff --git a/src/proto_012_PsiThaCa/lib_protocol/alpha_context.ml b/src/proto_012_Psithaca/lib_protocol/alpha_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/alpha_context.ml rename to src/proto_012_Psithaca/lib_protocol/alpha_context.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/alpha_context.mli b/src/proto_012_Psithaca/lib_protocol/alpha_context.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/alpha_context.mli rename to src/proto_012_Psithaca/lib_protocol/alpha_context.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/alpha_services.ml b/src/proto_012_Psithaca/lib_protocol/alpha_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/alpha_services.ml rename to src/proto_012_Psithaca/lib_protocol/alpha_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/alpha_services.mli b/src/proto_012_Psithaca/lib_protocol/alpha_services.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/alpha_services.mli rename to src/proto_012_Psithaca/lib_protocol/alpha_services.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/amendment.ml b/src/proto_012_Psithaca/lib_protocol/amendment.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/amendment.ml rename to src/proto_012_Psithaca/lib_protocol/amendment.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/amendment.mli b/src/proto_012_Psithaca/lib_protocol/amendment.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/amendment.mli rename to src/proto_012_Psithaca/lib_protocol/amendment.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/apply.ml b/src/proto_012_Psithaca/lib_protocol/apply.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/apply.ml rename to src/proto_012_Psithaca/lib_protocol/apply.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/apply.mli b/src/proto_012_Psithaca/lib_protocol/apply.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/apply.mli rename to src/proto_012_Psithaca/lib_protocol/apply.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/apply_results.ml b/src/proto_012_Psithaca/lib_protocol/apply_results.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/apply_results.ml rename to src/proto_012_Psithaca/lib_protocol/apply_results.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/apply_results.mli b/src/proto_012_Psithaca/lib_protocol/apply_results.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/apply_results.mli rename to src/proto_012_Psithaca/lib_protocol/apply_results.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/baking.ml b/src/proto_012_Psithaca/lib_protocol/baking.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/baking.ml rename to src/proto_012_Psithaca/lib_protocol/baking.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/baking.mli b/src/proto_012_Psithaca/lib_protocol/baking.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/baking.mli rename to src/proto_012_Psithaca/lib_protocol/baking.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/blinded_public_key_hash.ml b/src/proto_012_Psithaca/lib_protocol/blinded_public_key_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/blinded_public_key_hash.ml rename to src/proto_012_Psithaca/lib_protocol/blinded_public_key_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/blinded_public_key_hash.mli b/src/proto_012_Psithaca/lib_protocol/blinded_public_key_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/blinded_public_key_hash.mli rename to src/proto_012_Psithaca/lib_protocol/blinded_public_key_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_header_repr.ml b/src/proto_012_Psithaca/lib_protocol/block_header_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_header_repr.ml rename to src/proto_012_Psithaca/lib_protocol/block_header_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_header_repr.mli b/src/proto_012_Psithaca/lib_protocol/block_header_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_header_repr.mli rename to src/proto_012_Psithaca/lib_protocol/block_header_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_payload_hash.ml b/src/proto_012_Psithaca/lib_protocol/block_payload_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_payload_hash.ml rename to src/proto_012_Psithaca/lib_protocol/block_payload_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_payload_hash.mli b/src/proto_012_Psithaca/lib_protocol/block_payload_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_payload_hash.mli rename to src/proto_012_Psithaca/lib_protocol/block_payload_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_payload_repr.ml b/src/proto_012_Psithaca/lib_protocol/block_payload_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_payload_repr.ml rename to src/proto_012_Psithaca/lib_protocol/block_payload_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/block_payload_repr.mli b/src/proto_012_Psithaca/lib_protocol/block_payload_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/block_payload_repr.mli rename to src/proto_012_Psithaca/lib_protocol/block_payload_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/bootstrap_storage.ml b/src/proto_012_Psithaca/lib_protocol/bootstrap_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/bootstrap_storage.ml rename to src/proto_012_Psithaca/lib_protocol/bootstrap_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/bootstrap_storage.mli b/src/proto_012_Psithaca/lib_protocol/bootstrap_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/bootstrap_storage.mli rename to src/proto_012_Psithaca/lib_protocol/bootstrap_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/cache_memory_helpers.ml b/src/proto_012_Psithaca/lib_protocol/cache_memory_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/cache_memory_helpers.ml rename to src/proto_012_Psithaca/lib_protocol/cache_memory_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/cache_repr.ml b/src/proto_012_Psithaca/lib_protocol/cache_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/cache_repr.ml rename to src/proto_012_Psithaca/lib_protocol/cache_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/cache_repr.mli b/src/proto_012_Psithaca/lib_protocol/cache_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/cache_repr.mli rename to src/proto_012_Psithaca/lib_protocol/cache_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/commitment_repr.ml b/src/proto_012_Psithaca/lib_protocol/commitment_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/commitment_repr.ml rename to src/proto_012_Psithaca/lib_protocol/commitment_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/commitment_repr.mli b/src/proto_012_Psithaca/lib_protocol/commitment_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/commitment_repr.mli rename to src/proto_012_Psithaca/lib_protocol/commitment_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/commitment_storage.ml b/src/proto_012_Psithaca/lib_protocol/commitment_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/commitment_storage.ml rename to src/proto_012_Psithaca/lib_protocol/commitment_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/commitment_storage.mli b/src/proto_012_Psithaca/lib_protocol/commitment_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/commitment_storage.mli rename to src/proto_012_Psithaca/lib_protocol/commitment_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_repr.ml b/src/proto_012_Psithaca/lib_protocol/constants_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_repr.ml rename to src/proto_012_Psithaca/lib_protocol/constants_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_repr.mli b/src/proto_012_Psithaca/lib_protocol/constants_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_repr.mli rename to src/proto_012_Psithaca/lib_protocol/constants_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_services.ml b/src/proto_012_Psithaca/lib_protocol/constants_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_services.ml rename to src/proto_012_Psithaca/lib_protocol/constants_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_services.mli b/src/proto_012_Psithaca/lib_protocol/constants_services.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_services.mli rename to src/proto_012_Psithaca/lib_protocol/constants_services.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_storage.ml b/src/proto_012_Psithaca/lib_protocol/constants_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_storage.ml rename to src/proto_012_Psithaca/lib_protocol/constants_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/constants_storage.mli b/src/proto_012_Psithaca/lib_protocol/constants_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/constants_storage.mli rename to src/proto_012_Psithaca/lib_protocol/constants_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_delegate_storage.ml b/src/proto_012_Psithaca/lib_protocol/contract_delegate_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_delegate_storage.ml rename to src/proto_012_Psithaca/lib_protocol/contract_delegate_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_delegate_storage.mli b/src/proto_012_Psithaca/lib_protocol/contract_delegate_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_delegate_storage.mli rename to src/proto_012_Psithaca/lib_protocol/contract_delegate_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_hash.ml b/src/proto_012_Psithaca/lib_protocol/contract_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_hash.ml rename to src/proto_012_Psithaca/lib_protocol/contract_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_hash.mli b/src/proto_012_Psithaca/lib_protocol/contract_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_hash.mli rename to src/proto_012_Psithaca/lib_protocol/contract_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_manager_storage.ml b/src/proto_012_Psithaca/lib_protocol/contract_manager_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_manager_storage.ml rename to src/proto_012_Psithaca/lib_protocol/contract_manager_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_manager_storage.mli b/src/proto_012_Psithaca/lib_protocol/contract_manager_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_manager_storage.mli rename to src/proto_012_Psithaca/lib_protocol/contract_manager_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_repr.ml b/src/proto_012_Psithaca/lib_protocol/contract_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_repr.ml rename to src/proto_012_Psithaca/lib_protocol/contract_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_repr.mli b/src/proto_012_Psithaca/lib_protocol/contract_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_repr.mli rename to src/proto_012_Psithaca/lib_protocol/contract_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_services.ml b/src/proto_012_Psithaca/lib_protocol/contract_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_services.ml rename to src/proto_012_Psithaca/lib_protocol/contract_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_services.mli b/src/proto_012_Psithaca/lib_protocol/contract_services.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_services.mli rename to src/proto_012_Psithaca/lib_protocol/contract_services.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_storage.ml b/src/proto_012_Psithaca/lib_protocol/contract_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_storage.ml rename to src/proto_012_Psithaca/lib_protocol/contract_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/contract_storage.mli b/src/proto_012_Psithaca/lib_protocol/contract_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contract_storage.mli rename to src/proto_012_Psithaca/lib_protocol/contract_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.bin b/src/proto_012_Psithaca/lib_protocol/contracts/cpmm.bin similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.bin rename to src/proto_012_Psithaca/lib_protocol/contracts/cpmm.bin diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.mligo b/src/proto_012_Psithaca/lib_protocol/contracts/cpmm.mligo similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.mligo rename to src/proto_012_Psithaca/lib_protocol/contracts/cpmm.mligo diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.tz b/src/proto_012_Psithaca/lib_protocol/contracts/cpmm.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/cpmm.tz rename to src/proto_012_Psithaca/lib_protocol/contracts/cpmm.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.bin b/src/proto_012_Psithaca/lib_protocol/contracts/lqt.bin similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.bin rename to src/proto_012_Psithaca/lib_protocol/contracts/lqt.bin diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.mligo b/src/proto_012_Psithaca/lib_protocol/contracts/lqt.mligo similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.mligo rename to src/proto_012_Psithaca/lib_protocol/contracts/lqt.mligo diff --git a/src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.tz b/src/proto_012_Psithaca/lib_protocol/contracts/lqt.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/contracts/lqt.tz rename to src/proto_012_Psithaca/lib_protocol/contracts/lqt.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/coq-of-ocaml/README.md b/src/proto_012_Psithaca/lib_protocol/coq-of-ocaml/README.md similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/coq-of-ocaml/README.md rename to src/proto_012_Psithaca/lib_protocol/coq-of-ocaml/README.md diff --git a/src/proto_012_PsiThaCa/lib_protocol/coq-of-ocaml/config.json b/src/proto_012_Psithaca/lib_protocol/coq-of-ocaml/config.json similarity index 94% rename from src/proto_012_PsiThaCa/lib_protocol/coq-of-ocaml/config.json rename to src/proto_012_Psithaca/lib_protocol/coq-of-ocaml/config.json index 22b81851b21b79e8f8e2925961436e0aa2bb8e37..4a89eaa686dda2d098c72d20ad53215bfd4ae053 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/coq-of-ocaml/config.json +++ b/src/proto_012_Psithaca/lib_protocol/coq-of-ocaml/config.json @@ -14,7 +14,7 @@ "error_filename_blacklist": [ ], "error_message_blacklist": [ - "Unbound module Tezos_protocol_012_PsiThaCa_functor", + "Unbound module Tezos_protocol_012_Psithaca_functor", "The placeholders `_` in types are not handled", "No type known for the following variants: `Ge, `Lt, `Eq, `Le, `Gt", "No type known for the following variants: `Eq, `Ge, `Gt, `Le, `Lt", @@ -27,7 +27,7 @@ "A variable name instead of a pattern was expected", "We only support extensible types in patterns at the head", "This kind of signature is not handled", - "Tezos_raw_protocol_012_PsiThaCa.Raw_context_intf.T", + "Tezos_raw_protocol_012_Psithaca.Raw_context_intf.T", "No type known for the following variants:", "Constructor of the variant", "Polymorphic variant types are defined as standard algebraic types" @@ -91,7 +91,7 @@ "type_logger" ], "first_class_module_path_blacklist": [ - "Tezos_raw_protocol_012_PsiThaCa", + "Tezos_raw_protocol_012_Psithaca", "Tezos_protocol_environment_alpha.Environment", "Tezos_protocol_environment_alpha.Environment.Sapling" ], @@ -99,9 +99,9 @@ "Environment_context.TREE", "Tezos_protocol_environment_alpha__Environment.Map.OrderedType", "Tezos_protocol_environment_alpha__Environment.Set.OrderedType", - "Tezos_raw_protocol_012_PsiThaCa__Raw_context.T", - "Tezos_raw_protocol_012_PsiThaCa.Alpha_context.Cache.CLIENT", - "Tezos_raw_protocol_012_PsiThaCa.Alpha_context.Cache.INTERFACE", + "Tezos_raw_protocol_012_Psithaca__Raw_context.T", + "Tezos_raw_protocol_012_Psithaca.Alpha_context.Cache.CLIENT", + "Tezos_raw_protocol_012_Psithaca.Alpha_context.Cache.INTERFACE", "Tezos_sapling__Core_sig.T_encoding" ], "merge_returns": [ @@ -197,7 +197,7 @@ ["Compare.Z.(Compare.S.t)", "Z.t"] ], "require": [ - ["Tezos_raw_protocol_012_PsiThaCa", "TezosOfOCaml.Proto_alpha"] + ["Tezos_raw_protocol_012_Psithaca", "TezosOfOCaml.Proto_alpha"] ], "require_import": [ ["Tezos_protocol_environment_alpha", "TezosOfOCaml.Proto_alpha"] diff --git a/src/proto_012_PsiThaCa/lib_protocol/cycle_repr.ml b/src/proto_012_Psithaca/lib_protocol/cycle_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/cycle_repr.ml rename to src/proto_012_Psithaca/lib_protocol/cycle_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/cycle_repr.mli b/src/proto_012_Psithaca/lib_protocol/cycle_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/cycle_repr.mli rename to src/proto_012_Psithaca/lib_protocol/cycle_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_activation_storage.ml b/src/proto_012_Psithaca/lib_protocol/delegate_activation_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_activation_storage.ml rename to src/proto_012_Psithaca/lib_protocol/delegate_activation_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_activation_storage.mli b/src/proto_012_Psithaca/lib_protocol/delegate_activation_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_activation_storage.mli rename to src/proto_012_Psithaca/lib_protocol/delegate_activation_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_services.ml b/src/proto_012_Psithaca/lib_protocol/delegate_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_services.ml rename to src/proto_012_Psithaca/lib_protocol/delegate_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_services.mli b/src/proto_012_Psithaca/lib_protocol/delegate_services.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_services.mli rename to src/proto_012_Psithaca/lib_protocol/delegate_services.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_storage.ml b/src/proto_012_Psithaca/lib_protocol/delegate_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_storage.ml rename to src/proto_012_Psithaca/lib_protocol/delegate_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/delegate_storage.mli b/src/proto_012_Psithaca/lib_protocol/delegate_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/delegate_storage.mli rename to src/proto_012_Psithaca/lib_protocol/delegate_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/dune rename to src/proto_012_Psithaca/lib_protocol/dune diff --git a/src/proto_012_PsiThaCa/lib_protocol/dune-project b/src/proto_012_Psithaca/lib_protocol/dune-project similarity index 52% rename from src/proto_012_PsiThaCa/lib_protocol/dune-project rename to src/proto_012_Psithaca/lib_protocol/dune-project index df7b10d91d08f88c428411a36dab4adea6746383..d162b679588849e26f1e5ce3d2bb368d0debf513 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/dune-project +++ b/src/proto_012_Psithaca/lib_protocol/dune-project @@ -1,3 +1,3 @@ (lang dune 2.9) (formatting (enabled_for ocaml)) -(name tezos-embedded-protocol-012-PsiThaCa) +(name tezos-embedded-protocol-012-Psithaca) diff --git a/src/proto_012_PsiThaCa/lib_protocol/dune.inc b/src/proto_012_Psithaca/lib_protocol/dune.inc similarity index 94% rename from src/proto_012_PsiThaCa/lib_protocol/dune.inc rename to src/proto_012_Psithaca/lib_protocol/dune.inc index fbd579bff2bed15a989bdfa9818061d07e6b5d0c..0cd2252e62afd00bf4e536a12e2b2ff219993358 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/dune.inc +++ b/src/proto_012_Psithaca/lib_protocol/dune.inc @@ -20,7 +20,7 @@ (targets environment.ml) (action (write-file %{targets} - "module Name = struct let name = \"012-PsiThaCa\" end + "module Name = struct let name = \"012-Psithaca\" end include Tezos_protocol_environment.MakeV4(Name)() module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end "))) @@ -145,7 +145,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end (:src_dir TEZOS_PROTOCOL)) (action (with-stdout-to %{targets} - (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "012_PsiThaCa"))))) + (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "012_Psithaca"))))) (rule (targets functor.ml) @@ -388,31 +388,31 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end main.mli main.ml) (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_012_PsiThaCa.Environment -let hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP\" + "module Environment = Tezos_protocol_environment_012_Psithaca.Environment +let hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\" let name = Environment.Name.name -include Tezos_raw_protocol_012_PsiThaCa -include Tezos_raw_protocol_012_PsiThaCa.Main +include Tezos_raw_protocol_012_Psithaca +include Tezos_raw_protocol_012_Psithaca.Main "))) (library - (name tezos_protocol_environment_012_PsiThaCa) + (name tezos_protocol_environment_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-012-PsiThaCa.environment) + (public_name tezos-protocol-012-Psithaca.environment) (library_flags (:standard -linkall)) (libraries tezos-protocol-environment) (modules Environment)) (library - (name tezos_raw_protocol_012_PsiThaCa) + (name tezos_raw_protocol_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-012-PsiThaCa.raw) - (libraries tezos_protocol_environment_012_PsiThaCa) + (public_name tezos-protocol-012-Psithaca.raw) + (libraries tezos_protocol_environment_012_Psithaca) (library_flags (:standard -linkall)) (flags (:standard -nopervasives -nostdlib -w +a-4-40..42-44-45-48 -warn-error +a - -open Tezos_protocol_environment_012_PsiThaCa__Environment + -open Tezos_protocol_environment_012_Psithaca__Environment -open Pervasives -open Error_monad)) (modules @@ -533,43 +533,43 @@ include Tezos_raw_protocol_012_PsiThaCa.Main (install (section lib) - (package tezos-protocol-012-PsiThaCa) + (package tezos-protocol-012-Psithaca) (files (TEZOS_PROTOCOL as raw/TEZOS_PROTOCOL))) (library - (name tezos_protocol_012_PsiThaCa) + (name tezos_protocol_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-012-PsiThaCa) + (public_name tezos-protocol-012-Psithaca) (libraries tezos-protocol-environment tezos-protocol-environment-sigs - tezos_raw_protocol_012_PsiThaCa) + tezos_raw_protocol_012_Psithaca) (flags -w "+a-4-40..42-44-45-48" -warn-error "+a" -nopervasives) (modules Protocol)) (library - (name tezos_protocol_012_PsiThaCa_functor) + (name tezos_protocol_012_Psithaca_functor) ; The instrumentation is removed as it can lead to a stack overflow ; https://gitlab.com/tezos/tezos/-/issues/1927 ; (instrumentation (backend bisect_ppx)) - (public_name tezos-protocol-functor-012-PsiThaCa) + (public_name tezos-protocol-functor-012-Psithaca) (libraries tezos-protocol-environment tezos-protocol-environment-sigs - tezos-protocol-012-PsiThaCa.raw) + tezos-protocol-012-Psithaca.raw) (flags -w "+a-4-40..42-44-45-48" -warn-error "+a" -nopervasives) (modules Functor)) (library - (name tezos_embedded_protocol_012_PsiThaCa) + (name tezos_embedded_protocol_012_Psithaca) (instrumentation (backend bisect_ppx)) - (public_name tezos-embedded-protocol-012-PsiThaCa) + (public_name tezos-embedded-protocol-012-Psithaca) (library_flags (:standard -linkall)) - (libraries tezos-protocol-012-PsiThaCa + (libraries tezos-protocol-012-Psithaca tezos-protocol-updater tezos-protocol-environment) (flags (:standard -w +a-4-40..42-44-45-48 @@ -698,11 +698,11 @@ include Tezos_raw_protocol_012_PsiThaCa.Main (rule (alias runtest_sandbox) - (deps .tezos_protocol_012_PsiThaCa.objs/native/tezos_protocol_012_PsiThaCa.cmx) + (deps .tezos_protocol_012_Psithaca.objs/native/tezos_protocol_012_Psithaca.cmx) (action (progn))) (rule (alias runtest) - (package tezos-protocol-012-PsiThaCa) + (package tezos-protocol-012-Psithaca) (deps (alias runtest_sandbox)) (action (progn))) diff --git a/src/proto_012_PsiThaCa/lib_protocol/fees_storage.ml b/src/proto_012_Psithaca/lib_protocol/fees_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fees_storage.ml rename to src/proto_012_Psithaca/lib_protocol/fees_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/fees_storage.mli b/src/proto_012_Psithaca/lib_protocol/fees_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fees_storage.mli rename to src/proto_012_Psithaca/lib_protocol/fees_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/fitness_repr.ml b/src/proto_012_Psithaca/lib_protocol/fitness_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fitness_repr.ml rename to src/proto_012_Psithaca/lib_protocol/fitness_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/fitness_repr.mli b/src/proto_012_Psithaca/lib_protocol/fitness_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fitness_repr.mli rename to src/proto_012_Psithaca/lib_protocol/fitness_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/fixed_point_repr.ml b/src/proto_012_Psithaca/lib_protocol/fixed_point_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fixed_point_repr.ml rename to src/proto_012_Psithaca/lib_protocol/fixed_point_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/fixed_point_repr.mli b/src/proto_012_Psithaca/lib_protocol/fixed_point_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/fixed_point_repr.mli rename to src/proto_012_Psithaca/lib_protocol/fixed_point_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/frozen_deposits_storage.ml b/src/proto_012_Psithaca/lib_protocol/frozen_deposits_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/frozen_deposits_storage.ml rename to src/proto_012_Psithaca/lib_protocol/frozen_deposits_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/frozen_deposits_storage.mli b/src/proto_012_Psithaca/lib_protocol/frozen_deposits_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/frozen_deposits_storage.mli rename to src/proto_012_Psithaca/lib_protocol/frozen_deposits_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/gas_limit_repr.ml b/src/proto_012_Psithaca/lib_protocol/gas_limit_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/gas_limit_repr.ml rename to src/proto_012_Psithaca/lib_protocol/gas_limit_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/gas_limit_repr.mli b/src/proto_012_Psithaca/lib_protocol/gas_limit_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/gas_limit_repr.mli rename to src/proto_012_Psithaca/lib_protocol/gas_limit_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/gas_monad.ml b/src/proto_012_Psithaca/lib_protocol/gas_monad.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/gas_monad.ml rename to src/proto_012_Psithaca/lib_protocol/gas_monad.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/gas_monad.mli b/src/proto_012_Psithaca/lib_protocol/gas_monad.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/gas_monad.mli rename to src/proto_012_Psithaca/lib_protocol/gas_monad.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/global_constants_costs.ml b/src/proto_012_Psithaca/lib_protocol/global_constants_costs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/global_constants_costs.ml rename to src/proto_012_Psithaca/lib_protocol/global_constants_costs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/global_constants_costs.mli b/src/proto_012_Psithaca/lib_protocol/global_constants_costs.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/global_constants_costs.mli rename to src/proto_012_Psithaca/lib_protocol/global_constants_costs.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/global_constants_storage.ml b/src/proto_012_Psithaca/lib_protocol/global_constants_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/global_constants_storage.ml rename to src/proto_012_Psithaca/lib_protocol/global_constants_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/global_constants_storage.mli b/src/proto_012_Psithaca/lib_protocol/global_constants_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/global_constants_storage.mli rename to src/proto_012_Psithaca/lib_protocol/global_constants_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/init_storage.ml b/src/proto_012_Psithaca/lib_protocol/init_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/init_storage.ml rename to src/proto_012_Psithaca/lib_protocol/init_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/init_storage.mli b/src/proto_012_Psithaca/lib_protocol/init_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/init_storage.mli rename to src/proto_012_Psithaca/lib_protocol/init_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/lazy_storage_diff.ml b/src/proto_012_Psithaca/lib_protocol/lazy_storage_diff.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/lazy_storage_diff.ml rename to src/proto_012_Psithaca/lib_protocol/lazy_storage_diff.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/lazy_storage_diff.mli b/src/proto_012_Psithaca/lib_protocol/lazy_storage_diff.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/lazy_storage_diff.mli rename to src/proto_012_Psithaca/lib_protocol/lazy_storage_diff.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/lazy_storage_kind.ml b/src/proto_012_Psithaca/lib_protocol/lazy_storage_kind.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/lazy_storage_kind.ml rename to src/proto_012_Psithaca/lib_protocol/lazy_storage_kind.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/lazy_storage_kind.mli b/src/proto_012_Psithaca/lib_protocol/lazy_storage_kind.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/lazy_storage_kind.mli rename to src/proto_012_Psithaca/lib_protocol/lazy_storage_kind.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/level_repr.ml b/src/proto_012_Psithaca/lib_protocol/level_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/level_repr.ml rename to src/proto_012_Psithaca/lib_protocol/level_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/level_repr.mli b/src/proto_012_Psithaca/lib_protocol/level_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/level_repr.mli rename to src/proto_012_Psithaca/lib_protocol/level_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/level_storage.ml b/src/proto_012_Psithaca/lib_protocol/level_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/level_storage.ml rename to src/proto_012_Psithaca/lib_protocol/level_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/level_storage.mli b/src/proto_012_Psithaca/lib_protocol/level_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/level_storage.mli rename to src/proto_012_Psithaca/lib_protocol/level_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_cpmm.ml b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_cpmm.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_cpmm.ml rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_cpmm.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_lqt.ml b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_lqt.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_lqt.ml rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_lqt.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_migration.ml b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_migration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_migration.ml rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_migration.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_migration.mli b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_migration.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_migration.mli rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_migration.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_repr.ml b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_repr.ml rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_repr.mli b/src/proto_012_Psithaca/lib_protocol/liquidity_baking_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/liquidity_baking_repr.mli rename to src/proto_012_Psithaca/lib_protocol/liquidity_baking_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/local_gas_counter.ml b/src/proto_012_Psithaca/lib_protocol/local_gas_counter.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/local_gas_counter.ml rename to src/proto_012_Psithaca/lib_protocol/local_gas_counter.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/main.ml b/src/proto_012_Psithaca/lib_protocol/main.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/main.ml rename to src/proto_012_Psithaca/lib_protocol/main.ml index 8e8f8243b37ac7dcded304dc4daa32c58fc6d02d..a3b6fac5786d580e4796211b609300a9f08b1b1a 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/main.ml +++ b/src/proto_012_Psithaca/lib_protocol/main.ml @@ -819,4 +819,4 @@ let precheck_manager {ctxt; _} op = * 'kind Alpha_context.Kind.manager Apply_results.prechecked_contents_list) -> () -(* Vanity nonce: 0105000201649133 *) +(* Vanity nonce: 1031119008347755 *) diff --git a/src/proto_012_PsiThaCa/lib_protocol/main.mli b/src/proto_012_Psithaca/lib_protocol/main.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/main.mli rename to src/proto_012_Psithaca/lib_protocol/main.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/manager_repr.ml b/src/proto_012_Psithaca/lib_protocol/manager_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/manager_repr.ml rename to src/proto_012_Psithaca/lib_protocol/manager_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/manager_repr.mli b/src/proto_012_Psithaca/lib_protocol/manager_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/manager_repr.mli rename to src/proto_012_Psithaca/lib_protocol/manager_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/michelson_v1_gas.ml b/src/proto_012_Psithaca/lib_protocol/michelson_v1_gas.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/michelson_v1_gas.ml rename to src/proto_012_Psithaca/lib_protocol/michelson_v1_gas.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/michelson_v1_gas.mli b/src/proto_012_Psithaca/lib_protocol/michelson_v1_gas.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/michelson_v1_gas.mli rename to src/proto_012_Psithaca/lib_protocol/michelson_v1_gas.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/michelson_v1_primitives.ml b/src/proto_012_Psithaca/lib_protocol/michelson_v1_primitives.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/michelson_v1_primitives.ml rename to src/proto_012_Psithaca/lib_protocol/michelson_v1_primitives.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/michelson_v1_primitives.mli b/src/proto_012_Psithaca/lib_protocol/michelson_v1_primitives.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/michelson_v1_primitives.mli rename to src/proto_012_Psithaca/lib_protocol/michelson_v1_primitives.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/migration_repr.ml b/src/proto_012_Psithaca/lib_protocol/migration_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/migration_repr.ml rename to src/proto_012_Psithaca/lib_protocol/migration_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/migration_repr.mli b/src/proto_012_Psithaca/lib_protocol/migration_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/migration_repr.mli rename to src/proto_012_Psithaca/lib_protocol/migration_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/misc.ml b/src/proto_012_Psithaca/lib_protocol/misc.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/misc.ml rename to src/proto_012_Psithaca/lib_protocol/misc.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/misc.mli b/src/proto_012_Psithaca/lib_protocol/misc.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/misc.mli rename to src/proto_012_Psithaca/lib_protocol/misc.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/non_empty_string.ml b/src/proto_012_Psithaca/lib_protocol/non_empty_string.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/non_empty_string.ml rename to src/proto_012_Psithaca/lib_protocol/non_empty_string.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/non_empty_string.mli b/src/proto_012_Psithaca/lib_protocol/non_empty_string.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/non_empty_string.mli rename to src/proto_012_Psithaca/lib_protocol/non_empty_string.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/nonce_hash.ml b/src/proto_012_Psithaca/lib_protocol/nonce_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/nonce_hash.ml rename to src/proto_012_Psithaca/lib_protocol/nonce_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/nonce_hash.mli b/src/proto_012_Psithaca/lib_protocol/nonce_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/nonce_hash.mli rename to src/proto_012_Psithaca/lib_protocol/nonce_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/nonce_storage.ml b/src/proto_012_Psithaca/lib_protocol/nonce_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/nonce_storage.ml rename to src/proto_012_Psithaca/lib_protocol/nonce_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/nonce_storage.mli b/src/proto_012_Psithaca/lib_protocol/nonce_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/nonce_storage.mli rename to src/proto_012_Psithaca/lib_protocol/nonce_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/operation_repr.ml b/src/proto_012_Psithaca/lib_protocol/operation_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/operation_repr.ml rename to src/proto_012_Psithaca/lib_protocol/operation_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/operation_repr.mli b/src/proto_012_Psithaca/lib_protocol/operation_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/operation_repr.mli rename to src/proto_012_Psithaca/lib_protocol/operation_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/parameters_repr.ml b/src/proto_012_Psithaca/lib_protocol/parameters_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/parameters_repr.ml rename to src/proto_012_Psithaca/lib_protocol/parameters_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/parameters_repr.mli b/src/proto_012_Psithaca/lib_protocol/parameters_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/parameters_repr.mli rename to src/proto_012_Psithaca/lib_protocol/parameters_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/path_encoding.ml b/src/proto_012_Psithaca/lib_protocol/path_encoding.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/path_encoding.ml rename to src/proto_012_Psithaca/lib_protocol/path_encoding.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/path_encoding.mli b/src/proto_012_Psithaca/lib_protocol/path_encoding.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/path_encoding.mli rename to src/proto_012_Psithaca/lib_protocol/path_encoding.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/period_repr.ml b/src/proto_012_Psithaca/lib_protocol/period_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/period_repr.ml rename to src/proto_012_Psithaca/lib_protocol/period_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/period_repr.mli b/src/proto_012_Psithaca/lib_protocol/period_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/period_repr.mli rename to src/proto_012_Psithaca/lib_protocol/period_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/raw_context.ml b/src/proto_012_Psithaca/lib_protocol/raw_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/raw_context.ml rename to src/proto_012_Psithaca/lib_protocol/raw_context.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/raw_context.mli b/src/proto_012_Psithaca/lib_protocol/raw_context.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/raw_context.mli rename to src/proto_012_Psithaca/lib_protocol/raw_context.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/raw_context_intf.ml b/src/proto_012_Psithaca/lib_protocol/raw_context_intf.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/raw_context_intf.ml rename to src/proto_012_Psithaca/lib_protocol/raw_context_intf.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/raw_level_repr.ml b/src/proto_012_Psithaca/lib_protocol/raw_level_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/raw_level_repr.ml rename to src/proto_012_Psithaca/lib_protocol/raw_level_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/raw_level_repr.mli b/src/proto_012_Psithaca/lib_protocol/raw_level_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/raw_level_repr.mli rename to src/proto_012_Psithaca/lib_protocol/raw_level_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/receipt_repr.ml b/src/proto_012_Psithaca/lib_protocol/receipt_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/receipt_repr.ml rename to src/proto_012_Psithaca/lib_protocol/receipt_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/receipt_repr.mli b/src/proto_012_Psithaca/lib_protocol/receipt_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/receipt_repr.mli rename to src/proto_012_Psithaca/lib_protocol/receipt_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/roll_repr_legacy.ml b/src/proto_012_Psithaca/lib_protocol/roll_repr_legacy.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/roll_repr_legacy.ml rename to src/proto_012_Psithaca/lib_protocol/roll_repr_legacy.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/roll_repr_legacy.mli b/src/proto_012_Psithaca/lib_protocol/roll_repr_legacy.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/roll_repr_legacy.mli rename to src/proto_012_Psithaca/lib_protocol/roll_repr_legacy.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/roll_storage_legacy.ml b/src/proto_012_Psithaca/lib_protocol/roll_storage_legacy.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/roll_storage_legacy.ml rename to src/proto_012_Psithaca/lib_protocol/roll_storage_legacy.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/roll_storage_legacy.mli b/src/proto_012_Psithaca/lib_protocol/roll_storage_legacy.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/roll_storage_legacy.mli rename to src/proto_012_Psithaca/lib_protocol/roll_storage_legacy.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/round_repr.ml b/src/proto_012_Psithaca/lib_protocol/round_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/round_repr.ml rename to src/proto_012_Psithaca/lib_protocol/round_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/round_repr.mli b/src/proto_012_Psithaca/lib_protocol/round_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/round_repr.mli rename to src/proto_012_Psithaca/lib_protocol/round_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/sampler.ml b/src/proto_012_Psithaca/lib_protocol/sampler.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sampler.ml rename to src/proto_012_Psithaca/lib_protocol/sampler.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/sampler.mli b/src/proto_012_Psithaca/lib_protocol/sampler.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sampler.mli rename to src/proto_012_Psithaca/lib_protocol/sampler.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/sapling_repr.ml b/src/proto_012_Psithaca/lib_protocol/sapling_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sapling_repr.ml rename to src/proto_012_Psithaca/lib_protocol/sapling_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/sapling_services.ml b/src/proto_012_Psithaca/lib_protocol/sapling_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sapling_services.ml rename to src/proto_012_Psithaca/lib_protocol/sapling_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/sapling_storage.ml b/src/proto_012_Psithaca/lib_protocol/sapling_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sapling_storage.ml rename to src/proto_012_Psithaca/lib_protocol/sapling_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/sapling_validator.ml b/src/proto_012_Psithaca/lib_protocol/sapling_validator.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/sapling_validator.ml rename to src/proto_012_Psithaca/lib_protocol/sapling_validator.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/saturation_repr.ml b/src/proto_012_Psithaca/lib_protocol/saturation_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/saturation_repr.ml rename to src/proto_012_Psithaca/lib_protocol/saturation_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/saturation_repr.mli b/src/proto_012_Psithaca/lib_protocol/saturation_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/saturation_repr.mli rename to src/proto_012_Psithaca/lib_protocol/saturation_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_cache.ml b/src/proto_012_Psithaca/lib_protocol/script_cache.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_cache.ml rename to src/proto_012_Psithaca/lib_protocol/script_cache.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_cache.mli b/src/proto_012_Psithaca/lib_protocol/script_cache.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_cache.mli rename to src/proto_012_Psithaca/lib_protocol/script_cache.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_comparable.ml b/src/proto_012_Psithaca/lib_protocol/script_comparable.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_comparable.ml rename to src/proto_012_Psithaca/lib_protocol/script_comparable.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_comparable.mli b/src/proto_012_Psithaca/lib_protocol/script_comparable.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_comparable.mli rename to src/proto_012_Psithaca/lib_protocol/script_comparable.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_expr_hash.ml b/src/proto_012_Psithaca/lib_protocol/script_expr_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_expr_hash.ml rename to src/proto_012_Psithaca/lib_protocol/script_expr_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_expr_hash.mli b/src/proto_012_Psithaca/lib_protocol/script_expr_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_expr_hash.mli rename to src/proto_012_Psithaca/lib_protocol/script_expr_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_int_repr.ml b/src/proto_012_Psithaca/lib_protocol/script_int_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_int_repr.ml rename to src/proto_012_Psithaca/lib_protocol/script_int_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_int_repr.mli b/src/proto_012_Psithaca/lib_protocol/script_int_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_int_repr.mli rename to src/proto_012_Psithaca/lib_protocol/script_int_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_interpreter.ml b/src/proto_012_Psithaca/lib_protocol/script_interpreter.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/script_interpreter.ml rename to src/proto_012_Psithaca/lib_protocol/script_interpreter.ml index 1bbd4bc7cb04169b85bf57ca846d857161314bae..52303984abc74d666c8fd06be3e37d4ed4ebd5fa 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/script_interpreter.ml +++ b/src/proto_012_Psithaca/lib_protocol/script_interpreter.ml @@ -83,7 +83,6 @@ *) open Alpha_context -open Script open Script_typed_ir open Script_ir_translator open Local_gas_counter @@ -106,7 +105,7 @@ type error += Reject of Script.location * Script.expr * execution_trace option type error += Overflow of Script.location * execution_trace option -type error += Runtime_contract_error : Contract.t * Script.expr -> error +type error += Runtime_contract_error of Contract.t type error += Bad_contract_parameter of Contract.t (* `Permanent *) @@ -159,11 +158,10 @@ let () = ~description:"Toplevel error for all runtime script errors" (obj2 (req "contract_handle" Contract.encoding) - (req "contract_code" Script.expr_encoding)) + (req "contract_code" (constant "Deprecated"))) (function - | Runtime_contract_error (contract, expr) -> Some (contract, expr) - | _ -> None) - (fun (contract, expr) -> Runtime_contract_error (contract, expr)) ; + | Runtime_contract_error contract -> Some (contract, ()) | _ -> None) + (fun (contract, ()) -> Runtime_contract_error contract) ; (* Bad contract parameter *) register_error_kind `Permanent @@ -1689,17 +1687,12 @@ let execute logger ctxt mode step_constants ~entrypoint ~internal (Bad_contract_parameter step_constants.self) (parse_data ctxt ~legacy:false ~allow_forged:internal arg_type (box arg)) >>=? fun (arg, ctxt) -> - Script.force_decode_in_context - ~consume_deserialization_gas:When_needed - ctxt - unparsed_script.code - >>?= fun (script_code, ctxt) -> Script_ir_translator.collect_lazy_storage ctxt arg_type arg >>?= fun (to_duplicate, ctxt) -> Script_ir_translator.collect_lazy_storage ctxt storage_type storage >>?= fun (to_update, ctxt) -> trace - (Runtime_contract_error (step_constants.self, script_code)) + (Runtime_contract_error step_constants.self) (interp logger (ctxt, step_constants) code (arg, storage)) >>=? fun ((ops, storage), ctxt) -> Script_ir_translator.extract_lazy_storage_diff diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_interpreter.mli b/src/proto_012_Psithaca/lib_protocol/script_interpreter.mli similarity index 98% rename from src/proto_012_PsiThaCa/lib_protocol/script_interpreter.mli rename to src/proto_012_Psithaca/lib_protocol/script_interpreter.mli index 2f2f5b7c672bdefe5386fc924f961bd08c9aa624..e3332f8a3ad21e1e8c1e4f7652f81875a07094c8 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/script_interpreter.mli +++ b/src/proto_012_Psithaca/lib_protocol/script_interpreter.mli @@ -40,7 +40,7 @@ type error += Reject of Script.location * Script.expr * execution_trace option type error += Overflow of Script.location * execution_trace option -type error += Runtime_contract_error : Contract.t * Script.expr -> error +type error += Runtime_contract_error of Contract.t type error += Bad_contract_parameter of Contract.t (* `Permanent *) diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_interpreter_defs.ml b/src/proto_012_Psithaca/lib_protocol/script_interpreter_defs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_interpreter_defs.ml rename to src/proto_012_Psithaca/lib_protocol/script_interpreter_defs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_ir_annot.ml b/src/proto_012_Psithaca/lib_protocol/script_ir_annot.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_ir_annot.ml rename to src/proto_012_Psithaca/lib_protocol/script_ir_annot.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_ir_annot.mli b/src/proto_012_Psithaca/lib_protocol/script_ir_annot.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_ir_annot.mli rename to src/proto_012_Psithaca/lib_protocol/script_ir_annot.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_ir_translator.ml b/src/proto_012_Psithaca/lib_protocol/script_ir_translator.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_ir_translator.ml rename to src/proto_012_Psithaca/lib_protocol/script_ir_translator.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_ir_translator.mli b/src/proto_012_Psithaca/lib_protocol/script_ir_translator.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_ir_translator.mli rename to src/proto_012_Psithaca/lib_protocol/script_ir_translator.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_list.ml b/src/proto_012_Psithaca/lib_protocol/script_list.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_list.ml rename to src/proto_012_Psithaca/lib_protocol/script_list.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_list.mli b/src/proto_012_Psithaca/lib_protocol/script_list.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_list.mli rename to src/proto_012_Psithaca/lib_protocol/script_list.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_map.ml b/src/proto_012_Psithaca/lib_protocol/script_map.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_map.ml rename to src/proto_012_Psithaca/lib_protocol/script_map.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_map.mli b/src/proto_012_Psithaca/lib_protocol/script_map.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_map.mli rename to src/proto_012_Psithaca/lib_protocol/script_map.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_repr.ml b/src/proto_012_Psithaca/lib_protocol/script_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_repr.ml rename to src/proto_012_Psithaca/lib_protocol/script_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_repr.mli b/src/proto_012_Psithaca/lib_protocol/script_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_repr.mli rename to src/proto_012_Psithaca/lib_protocol/script_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_set.ml b/src/proto_012_Psithaca/lib_protocol/script_set.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_set.ml rename to src/proto_012_Psithaca/lib_protocol/script_set.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_set.mli b/src/proto_012_Psithaca/lib_protocol/script_set.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_set.mli rename to src/proto_012_Psithaca/lib_protocol/script_set.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_string_repr.ml b/src/proto_012_Psithaca/lib_protocol/script_string_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_string_repr.ml rename to src/proto_012_Psithaca/lib_protocol/script_string_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_string_repr.mli b/src/proto_012_Psithaca/lib_protocol/script_string_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_string_repr.mli rename to src/proto_012_Psithaca/lib_protocol/script_string_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_tc_errors.ml b/src/proto_012_Psithaca/lib_protocol/script_tc_errors.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_tc_errors.ml rename to src/proto_012_Psithaca/lib_protocol/script_tc_errors.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_tc_errors_registration.ml b/src/proto_012_Psithaca/lib_protocol/script_tc_errors_registration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_tc_errors_registration.ml rename to src/proto_012_Psithaca/lib_protocol/script_tc_errors_registration.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_tc_errors_registration.mli b/src/proto_012_Psithaca/lib_protocol/script_tc_errors_registration.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_tc_errors_registration.mli rename to src/proto_012_Psithaca/lib_protocol/script_tc_errors_registration.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_timestamp_repr.ml b/src/proto_012_Psithaca/lib_protocol/script_timestamp_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_timestamp_repr.ml rename to src/proto_012_Psithaca/lib_protocol/script_timestamp_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_timestamp_repr.mli b/src/proto_012_Psithaca/lib_protocol/script_timestamp_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_timestamp_repr.mli rename to src/proto_012_Psithaca/lib_protocol/script_timestamp_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir.ml b/src/proto_012_Psithaca/lib_protocol/script_typed_ir.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir.ml rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir.mli b/src/proto_012_Psithaca/lib_protocol/script_typed_ir.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir.mli rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size.ml b/src/proto_012_Psithaca/lib_protocol/script_typed_ir_size.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size.ml rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir_size.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size.mli b/src/proto_012_Psithaca/lib_protocol/script_typed_ir_size.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size.mli rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir_size.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size_costs.ml b/src/proto_012_Psithaca/lib_protocol/script_typed_ir_size_costs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size_costs.ml rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir_size_costs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size_costs.mli b/src/proto_012_Psithaca/lib_protocol/script_typed_ir_size_costs.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/script_typed_ir_size_costs.mli rename to src/proto_012_Psithaca/lib_protocol/script_typed_ir_size_costs.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/seed_repr.ml b/src/proto_012_Psithaca/lib_protocol/seed_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/seed_repr.ml rename to src/proto_012_Psithaca/lib_protocol/seed_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/seed_repr.mli b/src/proto_012_Psithaca/lib_protocol/seed_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/seed_repr.mli rename to src/proto_012_Psithaca/lib_protocol/seed_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/seed_storage.ml b/src/proto_012_Psithaca/lib_protocol/seed_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/seed_storage.ml rename to src/proto_012_Psithaca/lib_protocol/seed_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/seed_storage.mli b/src/proto_012_Psithaca/lib_protocol/seed_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/seed_storage.mli rename to src/proto_012_Psithaca/lib_protocol/seed_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/services_registration.ml b/src/proto_012_Psithaca/lib_protocol/services_registration.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/services_registration.ml rename to src/proto_012_Psithaca/lib_protocol/services_registration.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/services_registration.mli b/src/proto_012_Psithaca/lib_protocol/services_registration.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/services_registration.mli rename to src/proto_012_Psithaca/lib_protocol/services_registration.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/slot_repr.ml b/src/proto_012_Psithaca/lib_protocol/slot_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/slot_repr.ml rename to src/proto_012_Psithaca/lib_protocol/slot_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/slot_repr.mli b/src/proto_012_Psithaca/lib_protocol/slot_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/slot_repr.mli rename to src/proto_012_Psithaca/lib_protocol/slot_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/stake_storage.ml b/src/proto_012_Psithaca/lib_protocol/stake_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/stake_storage.ml rename to src/proto_012_Psithaca/lib_protocol/stake_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/stake_storage.mli b/src/proto_012_Psithaca/lib_protocol/stake_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/stake_storage.mli rename to src/proto_012_Psithaca/lib_protocol/stake_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/state_hash.ml b/src/proto_012_Psithaca/lib_protocol/state_hash.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/state_hash.ml rename to src/proto_012_Psithaca/lib_protocol/state_hash.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/state_hash.mli b/src/proto_012_Psithaca/lib_protocol/state_hash.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/state_hash.mli rename to src/proto_012_Psithaca/lib_protocol/state_hash.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage.ml b/src/proto_012_Psithaca/lib_protocol/storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage.ml rename to src/proto_012_Psithaca/lib_protocol/storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage.mli b/src/proto_012_Psithaca/lib_protocol/storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage.mli rename to src/proto_012_Psithaca/lib_protocol/storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_costs.ml b/src/proto_012_Psithaca/lib_protocol/storage_costs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_costs.ml rename to src/proto_012_Psithaca/lib_protocol/storage_costs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_costs.mli b/src/proto_012_Psithaca/lib_protocol/storage_costs.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_costs.mli rename to src/proto_012_Psithaca/lib_protocol/storage_costs.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_description.ml b/src/proto_012_Psithaca/lib_protocol/storage_description.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_description.ml rename to src/proto_012_Psithaca/lib_protocol/storage_description.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_description.mli b/src/proto_012_Psithaca/lib_protocol/storage_description.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_description.mli rename to src/proto_012_Psithaca/lib_protocol/storage_description.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_functors.ml b/src/proto_012_Psithaca/lib_protocol/storage_functors.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_functors.ml rename to src/proto_012_Psithaca/lib_protocol/storage_functors.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_functors.mli b/src/proto_012_Psithaca/lib_protocol/storage_functors.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_functors.mli rename to src/proto_012_Psithaca/lib_protocol/storage_functors.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/storage_sigs.ml b/src/proto_012_Psithaca/lib_protocol/storage_sigs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/storage_sigs.ml rename to src/proto_012_Psithaca/lib_protocol/storage_sigs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/.ocamlformat b/src/proto_012_Psithaca/lib_protocol/test/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/.ocamlformat rename to src/proto_012_Psithaca/lib_protocol/test/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/big_interpreter_stack.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/big_interpreter_stack.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/big_interpreter_stack.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/big_interpreter_stack.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_double.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_double.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_double.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_double.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_drop.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_drop.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_drop.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_drop.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_send.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_send.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_send.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_send.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_state_as_arg.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_state_as_arg.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_contract_state_as_arg.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_contract_state_as_arg.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_push_sapling_state.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_push_sapling_state.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_push_sapling_state.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_push_sapling_state.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_use_existing_state.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_use_existing_state.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/sapling_use_existing_state.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/sapling_use_existing_state.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/temp_big_maps.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/temp_big_maps.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/temp_big_maps.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/temp_big_maps.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/contracts/timelock.tz b/src/proto_012_Psithaca/lib_protocol/test/contracts/timelock.tz similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/contracts/timelock.tz rename to src/proto_012_Psithaca/lib_protocol/test/contracts/timelock.tz diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/dune b/src/proto_012_Psithaca/lib_protocol/test/dune similarity index 56% rename from src/proto_012_PsiThaCa/lib_protocol/test/dune rename to src/proto_012_Psithaca/lib_protocol/test/dune index e45d4c01c09a1e599bd6c4aa1a050d36ba0fb3f2..9e269e7ca329afda109fb72666a818f744f16dd3 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/dune @@ -6,7 +6,7 @@ liquidity_baking_pbt test_script_comparison test_sampler) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (deps (glob_files contracts/*)) (libraries tezos-base tezos-micheline @@ -14,67 +14,67 @@ alcotest-lwt tezos-test-helpers qcheck-alcotest - tezos-012-PsiThaCa-test-helpers + tezos-012-Psithaca-test-helpers tezos-stdlib-unix tezos-client-base - tezos-protocol-012-PsiThaCa-parameters + tezos-protocol-012-Psithaca-parameters tezos-base-test-helpers tezos-sapling astring - tezos-protocol-plugin-012-PsiThaCa + tezos-protocol-plugin-012-Psithaca tezos-benchmark - tezos-benchmark-012-PsiThaCa) + tezos-benchmark-012-Psithaca) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_micheline - -open Tezos_client_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa_parameters - -open Tezos_protocol_plugin_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa - -open Tezos_benchmark_012_PsiThaCa - -open Tezos_benchmark_type_inference_012_PsiThaCa - -open Tezos_012_PsiThaCa_test_helpers + -open Tezos_client_012_Psithaca + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_012_Psithaca_parameters + -open Tezos_protocol_plugin_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca + -open Tezos_benchmark_012_Psithaca + -open Tezos_benchmark_type_inference_012_Psithaca + -open Tezos_012_Psithaca_test_helpers -open Tezos_base_test_helpers))) (rule - (copy %{lib:tezos-protocol-012-PsiThaCa-parameters:test-parameters.json} + (copy %{lib:tezos-protocol-012-Psithaca-parameters:test-parameters.json} protocol_parameters.json)) ; runs both `Quick and `Slow tests (rule - (alias runtest_proto_012_PsiThaCa) + (alias runtest_proto_012_Psithaca) (deps (glob_files contracts/*)) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:main.exe}))) ; runs only the `Quick tests (rule (alias runtest_quick) (deps (glob_files contracts/*)) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:main.exe} -q))) (rule (alias runtest_saturation_fuzzing) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:saturation_fuzzing.exe}))) (rule (alias runtest_sampler) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:test_sampler.exe}))) (rule (alias runtest_test_script_comparison) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:test_script_comparison.exe}))) (rule (alias runtest_test_tez_repr) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:test_tez_repr.exe}))) (rule (alias runtest_liquidity_baking_pbt) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (action (run %{exe:liquidity_baking_pbt.exe}))) diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/.ocamlformat b/src/proto_012_Psithaca/lib_protocol/test/helpers/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/.ocamlformat rename to src/proto_012_Psithaca/lib_protocol/test/helpers/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/README.md b/src/proto_012_Psithaca/lib_protocol/test/helpers/README.md similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/README.md rename to src/proto_012_Psithaca/lib_protocol/test/helpers/README.md diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/account.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/account.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/account.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/account.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/account.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/account.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/account.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/account.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/assert.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/assert.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/assert.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/assert.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/block.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/block.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/block.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/block.ml index 119ddd6dda036ecdb135756ee4f6ab79741c57e9..5bbb823d5a6d3f8511ad6d74c58d031a094a48a5 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/block.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/block.ml @@ -270,7 +270,7 @@ let check_constants_consistency constants = let prepare_main_init_params ?bootstrap_contracts commitments constants initial_accounts = - let open Tezos_protocol_012_PsiThaCa_parameters in + let open Tezos_protocol_012_Psithaca_parameters in let bootstrap_accounts = List.map (fun (Account.{pk; pkh; _}, amount) -> @@ -373,7 +373,7 @@ let genesis_with_parameters parameters = ~seed_nonce_hash:None () in - let open Tezos_protocol_012_PsiThaCa_parameters in + let open Tezos_protocol_012_Psithaca_parameters in let json = Default_parameters.json_of_parameters parameters in let proto_params = Data_encoding.Binary.to_bytes_exn Data_encoding.json json @@ -412,7 +412,7 @@ let prepare_initial_context_params ?consensus_threshold ?min_proposal_quorum ?level ?cost_per_byte ?liquidity_baking_subsidy ?endorsing_reward_per_slot ?baking_reward_bonus_per_slot ?baking_reward_fixed_portion ?origination_size ?blocks_per_cycle initial_accounts = - let open Tezos_protocol_012_PsiThaCa_parameters in + let open Tezos_protocol_012_Psithaca_parameters in let constants = Default_parameters.constants_test in let min_proposal_quorum = Option.value ~default:constants.min_proposal_quorum min_proposal_quorum diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/block.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/block.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/block.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/block.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/consensus_helpers.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/consensus_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/consensus_helpers.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/consensus_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/context.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/context.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/context.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/context.ml index 4b27ddc8e9496e72cc376ec342c7785ddcdf786c..dbd1724846c17b1ec3399977dcd1f6b162ca0b2d 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/context.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/context.ml @@ -354,7 +354,7 @@ let init_with_constants constants n = (fun (a, _) -> Alpha_context.Contract.implicit_contract Account.(a.pkh)) accounts in - let open Tezos_protocol_012_PsiThaCa_parameters in + let open Tezos_protocol_012_Psithaca_parameters in let bootstrap_accounts = List.map (fun (acc, tez) -> diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/context.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/context.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/context.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/context.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/contract_helpers.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/contract_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/contract_helpers.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/contract_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/cpmm_logic.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/cpmm_logic.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/cpmm_logic.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/cpmm_logic.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/cpmm_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/cpmm_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/cpmm_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/cpmm_repr.ml diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune new file mode 100644 index 0000000000000000000000000000000000000000..ce08a5f18a55e16d1db7073d669a4f461cbd8081 --- /dev/null +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune @@ -0,0 +1,24 @@ +(library + (name tezos_012_Psithaca_test_helpers) + (instrumentation (backend bisect_ppx)) + (public_name tezos-012-Psithaca-test-helpers) + (libraries alcotest-lwt + qcheck-alcotest + tezos-test-helpers + tezos-base + tezos-micheline + tezos-stdlib-unix + tezos-shell-services + tezos-protocol-environment + tezos-protocol-012-Psithaca + tezos-protocol-012-Psithaca-parameters + tezos-client-012-Psithaca + tezos-protocol-plugin-012-Psithaca) + (flags (:standard -open Tezos_base__TzPervasives + -open Tezos_micheline + -open Tezos_stdlib_unix + -open Tezos_protocol_012_Psithaca + -open Tezos_client_012_Psithaca + -open Tezos_protocol_plugin_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca + -open Tezos_shell_services))) diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/dune-project b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune-project similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/dune-project rename to src/proto_012_Psithaca/lib_protocol/test/helpers/dune-project diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/error_monad_operators.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/error_monad_operators.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/error_monad_operators.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/expr.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/expr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/expr.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/expr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/expr_common.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/expr_common.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/expr_common.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/expr_common.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/incremental.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/incremental.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/incremental.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/incremental.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/incremental.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/incremental.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/incremental.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/incremental.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_generator.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_generator.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_generator.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_generator.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_generator.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_generator.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_generator.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_generator.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_machine.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_machine.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_machine.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_machine.ml index d0989378f5499c07e62e545ca675fa229c6e355e..0e19624e0cce258723cf1e900419a0f20d56f0bc 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_machine.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_machine.ml @@ -381,7 +381,7 @@ end (** {2 Tezos Constants} *) let default_subsidy = - let open Tezos_protocol_012_PsiThaCa_parameters in + let open Tezos_protocol_012_Psithaca_parameters in Tez.to_mutez @@ Default_parameters.constants_test.liquidity_baking_subsidy let security_deposit = 640_000_000L diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_machine.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_machine.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/liquidity_baking_machine.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/liquidity_baking_machine.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/lqt_fa12_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/lqt_fa12_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/lqt_fa12_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/lqt_fa12_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/nonce.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/nonce.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/nonce.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/nonce.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/nonce.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/nonce.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/nonce.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/nonce.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/op.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/op.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/op.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/op.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/op.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/op.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/op.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/op.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/rewards.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/rewards.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/rewards.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/rewards.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/sapling_helpers.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/sapling_helpers.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/sapling_helpers.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/sapling_helpers.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_big_map.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_big_map.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_big_map.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_big_map.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_big_map.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_list.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_list.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_list.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_list.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_list.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_list.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_list.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_list.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_map.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_map.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_map.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_map.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_map.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_map.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_map.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_map.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_set.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_set.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_set.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_set.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_set.mli b/src/proto_012_Psithaca/lib_protocol/test/helpers/script_set.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/script_set.mli rename to src/proto_012_Psithaca/lib_protocol/test/helpers/script_set.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/test_global_constants.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/test_global_constants.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/test_global_constants.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/test_global_constants.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/test_tez.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/test_tez.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/test_tez.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/test_tez.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/testable.ml b/src/proto_012_Psithaca/lib_protocol/test/helpers/testable.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/testable.ml rename to src/proto_012_Psithaca/lib_protocol/test/helpers/testable.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/tezos-012-PsiThaCa-test-helpers.opam b/src/proto_012_Psithaca/lib_protocol/test/helpers/tezos-012-Psithaca-test-helpers.opam similarity index 84% rename from src/proto_012_PsiThaCa/lib_protocol/test/helpers/tezos-012-PsiThaCa-test-helpers.opam rename to src/proto_012_Psithaca/lib_protocol/test/helpers/tezos-012-Psithaca-test-helpers.opam index c2a64a1032498d788796e10348db6ef156813f4d..3bd2292f1fa6b18539ae8b3d1e9ec942664ed128 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/helpers/tezos-012-PsiThaCa-test-helpers.opam +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/tezos-012-Psithaca-test-helpers.opam @@ -11,9 +11,9 @@ depends: [ "tezos-stdlib-unix" "tezos-shell-services" "tezos-protocol-environment" - "tezos-protocol-012-PsiThaCa" - "tezos-protocol-012-PsiThaCa-parameters" - "tezos-client-012-PsiThaCa" + "tezos-protocol-012-Psithaca" + "tezos-protocol-012-Psithaca-parameters" + "tezos-client-012-Psithaca" "tezos-test-helpers" "alcotest-lwt" "qcheck-alcotest" diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/liquidity_baking_pbt.ml b/src/proto_012_Psithaca/lib_protocol/test/liquidity_baking_pbt.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/liquidity_baking_pbt.ml rename to src/proto_012_Psithaca/lib_protocol/test/liquidity_baking_pbt.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/main.ml b/src/proto_012_Psithaca/lib_protocol/test/main.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/main.ml rename to src/proto_012_Psithaca/lib_protocol/test/main.ml index 3d6601be939baafde494d2f82605b6bb306e5c0d..5afd5cdfd88ac5213d55714ad16252190f16d0f9 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/main.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/main.ml @@ -32,7 +32,7 @@ let () = Alcotest_lwt.run - "protocol_012_PsiThaCa" + "protocol_012_Psithaca" [ ("transfer", Test_transfer.tests); ("origination", Test_origination.tests); diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/saturation_fuzzing.ml b/src/proto_012_Psithaca/lib_protocol/test/saturation_fuzzing.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/saturation_fuzzing.ml rename to src/proto_012_Psithaca/lib_protocol/test/saturation_fuzzing.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_activation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_activation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_activation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_activation.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_baking.ml b/src/proto_012_Psithaca/lib_protocol/test/test_baking.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_baking.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_baking.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_combined_operations.ml b/src/proto_012_Psithaca/lib_protocol/test/test_combined_operations.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_combined_operations.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_combined_operations.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_constants.ml b/src/proto_012_Psithaca/lib_protocol/test/test_constants.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_constants.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_constants.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_deactivation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_deactivation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_deactivation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_deactivation.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_delegation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_delegation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_delegation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_delegation.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_double_baking.ml b/src/proto_012_Psithaca/lib_protocol/test/test_double_baking.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_double_baking.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_double_baking.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_double_endorsement.ml b/src/proto_012_Psithaca/lib_protocol/test/test_double_endorsement.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_double_endorsement.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_double_endorsement.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_double_preendorsement.ml b/src/proto_012_Psithaca/lib_protocol/test/test_double_preendorsement.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_double_preendorsement.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_double_preendorsement.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_endorsement.ml b/src/proto_012_Psithaca/lib_protocol/test/test_endorsement.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_endorsement.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_endorsement.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_failing_noop.ml b/src/proto_012_Psithaca/lib_protocol/test/test_failing_noop.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_failing_noop.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_failing_noop.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_fitness.ml b/src/proto_012_Psithaca/lib_protocol/test/test_fitness.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_fitness.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_fitness.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_fixed_point.ml b/src/proto_012_Psithaca/lib_protocol/test/test_fixed_point.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_fixed_point.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_fixed_point.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_frozen_deposits.ml b/src/proto_012_Psithaca/lib_protocol/test/test_frozen_deposits.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_frozen_deposits.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_frozen_deposits.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_gas_costs.ml b/src/proto_012_Psithaca/lib_protocol/test/test_gas_costs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_gas_costs.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_gas_costs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_gas_levels.ml b/src/proto_012_Psithaca/lib_protocol/test/test_gas_levels.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_gas_levels.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_gas_levels.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_gas_properties.ml b/src/proto_012_Psithaca/lib_protocol/test/test_gas_properties.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_gas_properties.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_gas_properties.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_global_constants_storage.ml b/src/proto_012_Psithaca/lib_protocol/test/test_global_constants_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_global_constants_storage.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_global_constants_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_helpers_rpcs.ml b/src/proto_012_Psithaca/lib_protocol/test/test_helpers_rpcs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_helpers_rpcs.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_helpers_rpcs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_interpretation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_interpretation.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_interpretation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_interpretation.ml index 5fce6966082b750e3e4c996a383e8e5513f400a9..56f88fcd9272ff2b34d1b1eda55e5e4a99f32c86 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/test_interpretation.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/test_interpretation.ml @@ -202,8 +202,7 @@ let error_encoding_tests = [ ("Reject", Reject (0, script_expr_int, None)); ("Overflow", Overflow (0, None)); - ( "Runtime_contract_error", - Runtime_contract_error (contract_zero, script_expr_int) ); + ("Runtime_contract_error", Runtime_contract_error contract_zero); ("Bad_contract_parameter", Bad_contract_parameter contract_zero); ("Cannot_serialize_failure", Cannot_serialize_failure); ("Cannot_serialize_storage", Cannot_serialize_storage); diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_lazy_storage_diff.ml b/src/proto_012_Psithaca/lib_protocol/test/test_lazy_storage_diff.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_lazy_storage_diff.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_lazy_storage_diff.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_level_module.ml b/src/proto_012_Psithaca/lib_protocol/test/test_level_module.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_level_module.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_level_module.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_liquidity_baking.ml b/src/proto_012_Psithaca/lib_protocol/test/test_liquidity_baking.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_liquidity_baking.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_liquidity_baking.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_origination.ml b/src/proto_012_Psithaca/lib_protocol/test/test_origination.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_origination.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_origination.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_participation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_participation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_participation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_participation.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_preendorsement.ml b/src/proto_012_Psithaca/lib_protocol/test/test_preendorsement.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_preendorsement.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_preendorsement.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_preendorsement_functor.ml b/src/proto_012_Psithaca/lib_protocol/test/test_preendorsement_functor.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_preendorsement_functor.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_preendorsement_functor.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_qty.ml b/src/proto_012_Psithaca/lib_protocol/test/test_qty.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_qty.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_qty.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_receipt.ml b/src/proto_012_Psithaca/lib_protocol/test/test_receipt.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_receipt.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_receipt.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_reveal.ml b/src/proto_012_Psithaca/lib_protocol/test/test_reveal.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_reveal.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_reveal.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_round_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/test_round_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_round_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_round_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_sampler.ml b/src/proto_012_Psithaca/lib_protocol/test/test_sampler.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_sampler.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_sampler.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_sapling.ml b/src/proto_012_Psithaca/lib_protocol/test/test_sapling.ml similarity index 99% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_sapling.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_sapling.ml index 137d1cf8ca92ae78317111c6891b7960d3a356e3..4c5cab0cfaedf092a6c21a74ab7692864fb854f3 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/test_sapling.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/test_sapling.ml @@ -797,7 +797,7 @@ module Interpreter_tests = struct List.exists (function | Environment.Ecoproto_error - (Tezos_raw_protocol_012_PsiThaCa.Script_tc_errors + (Tezos_raw_protocol_012_Psithaca.Script_tc_errors .Unexpected_forged_value _) -> true | _ -> false) diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_saturation.ml b/src/proto_012_Psithaca/lib_protocol/test/test_saturation.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_saturation.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_saturation.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_script_comparison.ml b/src/proto_012_Psithaca/lib_protocol/test/test_script_comparison.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_script_comparison.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_script_comparison.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_script_typed_ir_size.ml b/src/proto_012_Psithaca/lib_protocol/test/test_script_typed_ir_size.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_script_typed_ir_size.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_script_typed_ir_size.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_seed.ml b/src/proto_012_Psithaca/lib_protocol/test/test_seed.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_seed.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_seed.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_storage.ml b/src/proto_012_Psithaca/lib_protocol/test/test_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_storage.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_temp_big_maps.ml b/src/proto_012_Psithaca/lib_protocol/test/test_temp_big_maps.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_temp_big_maps.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_temp_big_maps.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_tez_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/test_tez_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_tez_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_tez_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_balance_key.ml b/src/proto_012_Psithaca/lib_protocol/test/test_ticket_balance_key.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_balance_key.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_ticket_balance_key.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_scanner.ml b/src/proto_012_Psithaca/lib_protocol/test/test_ticket_scanner.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_scanner.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_ticket_scanner.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_storage.ml b/src/proto_012_Psithaca/lib_protocol/test/test_ticket_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_ticket_storage.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_ticket_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_time_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/test_time_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_time_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_time_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_timelock.ml b/src/proto_012_Psithaca/lib_protocol/test/test_timelock.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_timelock.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_timelock.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_token.ml b/src/proto_012_Psithaca/lib_protocol/test/test_token.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_token.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_token.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_transfer.ml b/src/proto_012_Psithaca/lib_protocol/test/test_transfer.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_transfer.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_transfer.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_typechecking.ml b/src/proto_012_Psithaca/lib_protocol/test/test_typechecking.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_typechecking.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_typechecking.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/test_voting.ml b/src/proto_012_Psithaca/lib_protocol/test/test_voting.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/test_voting.ml rename to src/proto_012_Psithaca/lib_protocol/test/test_voting.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/.ocamlformat b/src/proto_012_Psithaca/lib_protocol/test/unit/.ocamlformat similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/.ocamlformat rename to src/proto_012_Psithaca/lib_protocol/test/unit/.ocamlformat diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/dune b/src/proto_012_Psithaca/lib_protocol/test/unit/dune similarity index 52% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/dune rename to src/proto_012_Psithaca/lib_protocol/test/unit/dune index f59953beacc3594ae3c7b3b9fee8879f877bec08..096fe8c7229e9edf7a2efdf00be4fc2ceae89244 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/unit/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/unit/dune @@ -1,20 +1,20 @@ (test (name main) - (package tezos-protocol-012-PsiThaCa-tests) + (package tezos-protocol-012-Psithaca-tests) (libraries tezos-base tezos-micheline tezos-protocol-environment alcotest-lwt - tezos-012-PsiThaCa-test-helpers + tezos-012-Psithaca-test-helpers tezos-stdlib-unix tezos-client-base - tezos-protocol-012-PsiThaCa-parameters + tezos-protocol-012-Psithaca-parameters tezos-base-test-helpers) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_base_test_helpers -open Tezos_micheline - -open Tezos_client_012_PsiThaCa - -open Tezos_protocol_012_PsiThaCa - -open Tezos_protocol_environment_012_PsiThaCa - -open Tezos_012_PsiThaCa_test_helpers)) + -open Tezos_client_012_Psithaca + -open Tezos_protocol_012_Psithaca + -open Tezos_protocol_environment_012_Psithaca + -open Tezos_012_Psithaca_test_helpers)) (action (run %{test} "test" "Unit"))) diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/main.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/main.ml similarity index 98% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/main.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/main.ml index 9d9bbd2f10df32570ad26536c0b35db86ca6de0d..22795576e7154399ba0dc8b849accddcc1267812 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/test/unit/main.ml +++ b/src/proto_012_Psithaca/lib_protocol/test/unit/main.ml @@ -45,7 +45,7 @@ end let () = Alcotest_lwt.run - "protocol_012_PsiThaCa unit tests" + "protocol_012_Psithaca unit tests" [ Unit_test.spec "Alpha_context.ml" Test_alpha_context.tests; Unit_test.spec "Raw_level_repr.ml" Test_raw_level_repr.tests; diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_alpha_context.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_alpha_context.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_alpha_context.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_alpha_context.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_contract_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_contract_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_contract_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_contract_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_global_constants_storage.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_global_constants_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_global_constants_storage.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_global_constants_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_operation_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_operation_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_operation_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_operation_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_raw_level_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_raw_level_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_raw_level_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_raw_level_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/test/unit/test_tez_repr.ml b/src/proto_012_Psithaca/lib_protocol/test/unit/test_tez_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/test/unit/test_tez_repr.ml rename to src/proto_012_Psithaca/lib_protocol/test/unit/test_tez_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/tez_repr.ml b/src/proto_012_Psithaca/lib_protocol/tez_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/tez_repr.ml rename to src/proto_012_Psithaca/lib_protocol/tez_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/tez_repr.mli b/src/proto_012_Psithaca/lib_protocol/tez_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/tez_repr.mli rename to src/proto_012_Psithaca/lib_protocol/tez_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/tezos-embedded-protocol-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_protocol/tezos-embedded-protocol-012-Psithaca.opam similarity index 93% rename from src/proto_012_PsiThaCa/lib_protocol/tezos-embedded-protocol-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_protocol/tezos-embedded-protocol-012-Psithaca.opam index b4adacc5f3d4ab048e3a0ddbd800e42c16fd29b0..45fe0519f328922f61bbd19fb557ab17d7348432 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/tezos-embedded-protocol-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_protocol/tezos-embedded-protocol-012-Psithaca.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.9" } - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-protocol-compiler" "tezos-protocol-updater" ] @@ -17,7 +17,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/dune_protocol.template.v1" "dune" "%{tezos-protocol-compiler:lib}%/final_protocol_versions" - "012_PsiThaCa" + "012_Psithaca" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} diff --git a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa-tests.opam b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca-tests.opam similarity index 85% rename from src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa-tests.opam rename to src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca-tests.opam index fe3eea4ba5bce09cce1171edc2186dd79cdecf5e..3b775c5ee66c9918d1e86833c2b4a84e71e0d3cf 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa-tests.opam +++ b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca-tests.opam @@ -12,15 +12,15 @@ depends: [ "astring" { with-test } "tezos-test-helpers" { with-test } "qcheck-alcotest" { with-test } - "tezos-012-PsiThaCa-test-helpers" { with-test } + "tezos-012-Psithaca-test-helpers" { with-test } "tezos-stdlib-unix" { with-test } "tezos-protocol-environment" { with-test } "tezos-client-base" { with-test } - "tezos-protocol-012-PsiThaCa-parameters" { with-test } + "tezos-protocol-012-Psithaca-parameters" { with-test } "tezos-shell-services" { with-test } "tezos-base-test-helpers" { with-test } "tezos-benchmark" { with-test } - "tezos-benchmark-012-PsiThaCa" { with-test } + "tezos-benchmark-012-Psithaca" { with-test } ] build: [ [ @@ -28,7 +28,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/dune_protocol.template.v1" "dune" "%{tezos-protocol-compiler:lib}%/final_protocol_versions" - "012_PsiThaCa" + "012_Psithaca" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} diff --git a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca.opam similarity index 97% rename from src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca.opam index d5ac2fcc085fb0b3baa05dcd2b736843de2c6b35..5224ae123b0ae847e0ba8995d2ca91fab8b84457 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-012-Psithaca.opam @@ -15,7 +15,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/dune_protocol.template.v1" "dune" "%{tezos-protocol-compiler:lib}%/final_protocol_versions" - "012_PsiThaCa" + "012_Psithaca" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} diff --git a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-functor-012-PsiThaCa.opam b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-functor-012-Psithaca.opam similarity index 93% rename from src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-functor-012-PsiThaCa.opam rename to src/proto_012_Psithaca/lib_protocol/tezos-protocol-functor-012-Psithaca.opam index 6e13881c468d46f7c44f2d65959d90bfb26f6840..c2927cef1091b49e2535d13f1c49f2c0e2774aa1 100644 --- a/src/proto_012_PsiThaCa/lib_protocol/tezos-protocol-functor-012-PsiThaCa.opam +++ b/src/proto_012_Psithaca/lib_protocol/tezos-protocol-functor-012-Psithaca.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "2.9" } - "tezos-protocol-012-PsiThaCa" + "tezos-protocol-012-Psithaca" "tezos-protocol-compiler" ] build: [ @@ -16,7 +16,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/dune_protocol.template.v1" "dune" "%{tezos-protocol-compiler:lib}%/final_protocol_versions" - "012_PsiThaCa" + "012_Psithaca" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_balance_key.ml b/src/proto_012_Psithaca/lib_protocol/ticket_balance_key.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_balance_key.ml rename to src/proto_012_Psithaca/lib_protocol/ticket_balance_key.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_balance_key.mli b/src/proto_012_Psithaca/lib_protocol/ticket_balance_key.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_balance_key.mli rename to src/proto_012_Psithaca/lib_protocol/ticket_balance_key.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_costs.ml b/src/proto_012_Psithaca/lib_protocol/ticket_costs.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_costs.ml rename to src/proto_012_Psithaca/lib_protocol/ticket_costs.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_costs.mli b/src/proto_012_Psithaca/lib_protocol/ticket_costs.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_costs.mli rename to src/proto_012_Psithaca/lib_protocol/ticket_costs.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_scanner.ml b/src/proto_012_Psithaca/lib_protocol/ticket_scanner.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_scanner.ml rename to src/proto_012_Psithaca/lib_protocol/ticket_scanner.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_scanner.mli b/src/proto_012_Psithaca/lib_protocol/ticket_scanner.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_scanner.mli rename to src/proto_012_Psithaca/lib_protocol/ticket_scanner.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_storage.ml b/src/proto_012_Psithaca/lib_protocol/ticket_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_storage.ml rename to src/proto_012_Psithaca/lib_protocol/ticket_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/ticket_storage.mli b/src/proto_012_Psithaca/lib_protocol/ticket_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/ticket_storage.mli rename to src/proto_012_Psithaca/lib_protocol/ticket_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/time_repr.ml b/src/proto_012_Psithaca/lib_protocol/time_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/time_repr.ml rename to src/proto_012_Psithaca/lib_protocol/time_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/time_repr.mli b/src/proto_012_Psithaca/lib_protocol/time_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/time_repr.mli rename to src/proto_012_Psithaca/lib_protocol/time_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/token.ml b/src/proto_012_Psithaca/lib_protocol/token.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/token.ml rename to src/proto_012_Psithaca/lib_protocol/token.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/token.mli b/src/proto_012_Psithaca/lib_protocol/token.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/token.mli rename to src/proto_012_Psithaca/lib_protocol/token.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/vote_repr.ml b/src/proto_012_Psithaca/lib_protocol/vote_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/vote_repr.ml rename to src/proto_012_Psithaca/lib_protocol/vote_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/vote_repr.mli b/src/proto_012_Psithaca/lib_protocol/vote_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/vote_repr.mli rename to src/proto_012_Psithaca/lib_protocol/vote_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/vote_storage.ml b/src/proto_012_Psithaca/lib_protocol/vote_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/vote_storage.ml rename to src/proto_012_Psithaca/lib_protocol/vote_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/vote_storage.mli b/src/proto_012_Psithaca/lib_protocol/vote_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/vote_storage.mli rename to src/proto_012_Psithaca/lib_protocol/vote_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_period_repr.ml b/src/proto_012_Psithaca/lib_protocol/voting_period_repr.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_period_repr.ml rename to src/proto_012_Psithaca/lib_protocol/voting_period_repr.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_period_repr.mli b/src/proto_012_Psithaca/lib_protocol/voting_period_repr.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_period_repr.mli rename to src/proto_012_Psithaca/lib_protocol/voting_period_repr.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_period_storage.ml b/src/proto_012_Psithaca/lib_protocol/voting_period_storage.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_period_storage.ml rename to src/proto_012_Psithaca/lib_protocol/voting_period_storage.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_period_storage.mli b/src/proto_012_Psithaca/lib_protocol/voting_period_storage.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_period_storage.mli rename to src/proto_012_Psithaca/lib_protocol/voting_period_storage.mli diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_services.ml b/src/proto_012_Psithaca/lib_protocol/voting_services.ml similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_services.ml rename to src/proto_012_Psithaca/lib_protocol/voting_services.ml diff --git a/src/proto_012_PsiThaCa/lib_protocol/voting_services.mli b/src/proto_012_Psithaca/lib_protocol/voting_services.mli similarity index 100% rename from src/proto_012_PsiThaCa/lib_protocol/voting_services.mli rename to src/proto_012_Psithaca/lib_protocol/voting_services.mli diff --git a/src/proto_012_PsiThaCa/parameters/dune b/src/proto_012_Psithaca/parameters/dune similarity index 100% rename from src/proto_012_PsiThaCa/parameters/dune rename to src/proto_012_Psithaca/parameters/dune diff --git a/tests_python/tests_012/test_rpc.py b/tests_python/tests_012/test_rpc.py index ee8ba1a5ed154b370a0050d26bbae8605f2d6938..2a32d6ec010d0587f03cfb23dd951c4fb0d24fb1 100644 --- a/tests_python/tests_012/test_rpc.py +++ b/tests_python/tests_012/test_rpc.py @@ -258,7 +258,7 @@ class TestRPCsExistence: self, sandbox: Sandbox, session: dict ): # only implicit contracts, see - # proto_012_PsiThaCa/lib_protocol/contract_repr.ml + # proto_012_Psithaca/lib_protocol/contract_repr.ml for contract_id in session["implicit_accounts"]: sandbox.client(1).rpc( 'get', diff --git a/tests_python/tools/constants.py b/tests_python/tools/constants.py index 71c62c0ae6ae71beec3976bd9dbb567657f42015..ed3f4fa42d911016c5f1cd802e6638e07423127b 100644 --- a/tests_python/tools/constants.py +++ b/tests_python/tools/constants.py @@ -90,9 +90,9 @@ HANGZHOU_DAEMON = "011-PtHangz2" HANGZHOU_FOLDER = "proto_011_PtHangz2" HANGZHOU_PARAMETERS = get_parameters(HANGZHOU_FOLDER) -ITHACA = "PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP" -ITHACA_DAEMON = "012-PsiThaCa" -ITHACA_FOLDER = "proto_012_PsiThaCa" +ITHACA = "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A" +ITHACA_DAEMON = "012-Psithaca" +ITHACA_FOLDER = "proto_012_Psithaca" ITHACA_PARAMETERS = get_parameters(ITHACA_FOLDER) TEZOS_CRT = """ diff --git a/tezt/_regressions/encoding/ithaca.block_header.out b/tezt/_regressions/encoding/ithaca.block_header.out index 00d1d06f2b20cd00bab29cccf7da4e06adf6e711..9a7be0523430e1e072be0ec844583b4dc3f5cbf6 100644 --- a/tezt/_regressions/encoding/ithaca.block_header.out +++ b/tezt/_regressions/encoding/ithaca.block_header.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.block_header.out -./tezos-codec encode 012-PsiThaCa.block_header from '{ +./tezos-codec encode 012-Psithaca.block_header from '{ "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", @@ -21,7 +21,7 @@ tezt/_regressions/encoding/ithaca.block_header.out }' 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d5580066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.block_header from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d5580066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.block_header from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d5580066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "timestamp": "2020-04-20T16:20:00Z", "validation_pass": 2, diff --git a/tezt/_regressions/encoding/ithaca.block_header.raw.out b/tezt/_regressions/encoding/ithaca.block_header.raw.out index 150f089f93c716956a103deed0e3c90496fda202..04d25333ad8c6616fb2871b021b40b38ba18c21c 100644 --- a/tezt/_regressions/encoding/ithaca.block_header.raw.out +++ b/tezt/_regressions/encoding/ithaca.block_header.raw.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.block_header.raw.out -./tezos-codec encode 012-PsiThaCa.block_header.raw from '{ +./tezos-codec encode 012-Psithaca.block_header.raw from '{ "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", @@ -16,7 +16,7 @@ tezt/_regressions/encoding/ithaca.block_header.raw.out }' 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c521d101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.block_header.raw from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c521d101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.block_header.raw from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c521d101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "timestamp": "2020-04-20T16:20:00Z", "validation_pass": 2, diff --git a/tezt/_regressions/encoding/ithaca.block_header.unsigned.out b/tezt/_regressions/encoding/ithaca.block_header.unsigned.out index cd3a2c85ef3186a1d499e6b4cf5689269112acd2..ab332c72fb4c7b45439d32ff0dcd22bf5ca1aa58 100644 --- a/tezt/_regressions/encoding/ithaca.block_header.unsigned.out +++ b/tezt/_regressions/encoding/ithaca.block_header.unsigned.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.block_header.unsigned.out -./tezos-codec encode 012-PsiThaCa.block_header.unsigned from '{ +./tezos-codec encode 012-Psithaca.block_header.unsigned from '{ "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", @@ -20,7 +20,7 @@ tezt/_regressions/encoding/ithaca.block_header.unsigned.out }' 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55800 -./tezos-codec decode 012-PsiThaCa.block_header.unsigned from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55800 +./tezos-codec decode 012-Psithaca.block_header.unsigned from 00000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00242e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000ff043691f53c02ca1ac6f1a0c1586bf77973e04c2d9b618a8309e79651daf0d55800 { "level": 1331, "proto": 1, "predecessor": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "timestamp": "2020-04-20T16:20:00Z", "validation_pass": 2, diff --git a/tezt/_regressions/encoding/ithaca.contract.big_map_diff.out b/tezt/_regressions/encoding/ithaca.contract.big_map_diff.out index 79ac1937eaeab9fc5740a9dadb8ef7a1ee7e1af7..0e67127af7a7b8a4d805f8c1b2cbba5bde9c379a 100644 --- a/tezt/_regressions/encoding/ithaca.contract.big_map_diff.out +++ b/tezt/_regressions/encoding/ithaca.contract.big_map_diff.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.contract.big_map_diff.out -./tezos-codec encode 012-PsiThaCa.contract.big_map_diff from '[ +./tezos-codec encode 012-Psithaca.contract.big_map_diff from '[ { "action": "alloc", "big_map": "0", @@ -18,11 +18,11 @@ tezt/_regressions/encoding/ithaca.contract.big_map_diff.out ]' 000000100300020000000203620200000002036c -./tezos-codec decode 012-PsiThaCa.contract.big_map_diff from 000000100300020000000203620200000002036c +./tezos-codec decode 012-Psithaca.contract.big_map_diff from 000000100300020000000203620200000002036c [ { "action": "alloc", "big_map": "0", "key_type": [ { "prim": "nat" } ], "value_type": [ { "prim": "unit" } ] } ] -./tezos-codec encode 012-PsiThaCa.contract.big_map_diff from '[ +./tezos-codec encode 012-Psithaca.contract.big_map_diff from '[ { "action": "copy", "source_big_map": "0", @@ -31,10 +31,10 @@ tezt/_regressions/encoding/ithaca.contract.big_map_diff.out ]' 00000003020001 -./tezos-codec decode 012-PsiThaCa.contract.big_map_diff from 00000003020001 +./tezos-codec decode 012-Psithaca.contract.big_map_diff from 00000003020001 [ { "action": "copy", "source_big_map": "0", "destination_big_map": "1" } ] -./tezos-codec encode 012-PsiThaCa.contract.big_map_diff from '[ +./tezos-codec encode 012-Psithaca.contract.big_map_diff from '[ { "action": "remove", "big_map": "0" @@ -42,10 +42,10 @@ tezt/_regressions/encoding/ithaca.contract.big_map_diff.out ]' 000000020100 -./tezos-codec decode 012-PsiThaCa.contract.big_map_diff from 000000020100 +./tezos-codec decode 012-Psithaca.contract.big_map_diff from 000000020100 [ { "action": "remove", "big_map": "0" } ] -./tezos-codec encode 012-PsiThaCa.contract.big_map_diff from '[ +./tezos-codec encode 012-Psithaca.contract.big_map_diff from '[ { "action": "update", "big_map": "0", @@ -64,7 +64,7 @@ tezt/_regressions/encoding/ithaca.contract.big_map_diff.out ]' 000000310000cffedbaf00cb581448a5683abdefe0d5cd4d4ba4923f1a489791810c3fec332502000000020001ff0200000002034f -./tezos-codec decode 012-PsiThaCa.contract.big_map_diff from 000000310000cffedbaf00cb581448a5683abdefe0d5cd4d4ba4923f1a489791810c3fec332502000000020001ff0200000002034f +./tezos-codec decode 012-Psithaca.contract.big_map_diff from 000000310000cffedbaf00cb581448a5683abdefe0d5cd4d4ba4923f1a489791810c3fec332502000000020001ff0200000002034f [ { "action": "update", "big_map": "0", "key_hash": "exprv6UsC1sN3Fk2XfgcJCL8NCerP5rCGy1PRESZAqr7L2JdzX55EN", "key": [ { "int": "1" } ], "value": [ { "prim": "UNIT" } ] } ] diff --git a/tezt/_regressions/encoding/ithaca.contract.out b/tezt/_regressions/encoding/ithaca.contract.out index 399fc8f1ff4acb543f77ea9be2b5081095f0a723..dfaeb18bb3da49fcaf26281713959a42461dec02 100644 --- a/tezt/_regressions/encoding/ithaca.contract.out +++ b/tezt/_regressions/encoding/ithaca.contract.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.contract.out -./tezos-codec encode 012-PsiThaCa.contract from '"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"' +./tezos-codec encode 012-Psithaca.contract from '"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"' 000002298c03ed7d454a101eb7022bc95f7e5f41ac78 -./tezos-codec decode 012-PsiThaCa.contract from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78 +./tezos-codec decode 012-Psithaca.contract from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78 "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" -./tezos-codec encode 012-PsiThaCa.contract from '"KT1DieU51jzXLerQx5AqMCiLC1SsCeM8yRat"' +./tezos-codec encode 012-Psithaca.contract from '"KT1DieU51jzXLerQx5AqMCiLC1SsCeM8yRat"' 0138560805b4c8d7b7fbbafad5c59dbfa3878ca70500 -./tezos-codec decode 012-PsiThaCa.contract from 0138560805b4c8d7b7fbbafad5c59dbfa3878ca70500 +./tezos-codec decode 012-Psithaca.contract from 0138560805b4c8d7b7fbbafad5c59dbfa3878ca70500 "KT1DieU51jzXLerQx5AqMCiLC1SsCeM8yRat" diff --git a/tezt/_regressions/encoding/ithaca.cycle.out b/tezt/_regressions/encoding/ithaca.cycle.out index 76e2fe204da348a91d60a797ee583e8bcd57d6ed..0d2dee72cdc11cbe89131537055b78f9313a7cf6 100644 --- a/tezt/_regressions/encoding/ithaca.cycle.out +++ b/tezt/_regressions/encoding/ithaca.cycle.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.cycle.out -./tezos-codec encode 012-PsiThaCa.cycle from 2147483647 +./tezos-codec encode 012-Psithaca.cycle from 2147483647 7fffffff -./tezos-codec decode 012-PsiThaCa.cycle from 7fffffff +./tezos-codec decode 012-Psithaca.cycle from 7fffffff 2147483647 -./tezos-codec encode 012-PsiThaCa.cycle from 0 +./tezos-codec encode 012-Psithaca.cycle from 0 00000000 -./tezos-codec decode 012-PsiThaCa.cycle from 00000000 +./tezos-codec decode 012-Psithaca.cycle from 00000000 0 diff --git a/tezt/_regressions/encoding/ithaca.fitness.out b/tezt/_regressions/encoding/ithaca.fitness.out index ad2c9aff02d61ba32219d1b0e43e79e8fa320fad..b93629dc3bba89e09fb6ab96dd101bade0df8931 100644 --- a/tezt/_regressions/encoding/ithaca.fitness.out +++ b/tezt/_regressions/encoding/ithaca.fitness.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.fitness.out -./tezos-codec encode 012-PsiThaCa.fitness from '{ +./tezos-codec encode 012-Psithaca.fitness from '{ "level": 1, "locked_round": 1, "predecessor_round": 1, @@ -8,5 +8,5 @@ tezt/_regressions/encoding/ithaca.fitness.out }' 0000000101000000010000000100000002 -./tezos-codec decode 012-PsiThaCa.fitness from 0000000101000000010000000100000002 +./tezos-codec decode 012-Psithaca.fitness from 0000000101000000010000000100000002 { "level": 1, "locked_round": 1, "predecessor_round": 1, "round": 2 } diff --git a/tezt/_regressions/encoding/ithaca.gas.cost.out b/tezt/_regressions/encoding/ithaca.gas.cost.out index a6d893f327b2ff5618d419a1edcb714ac4e1aa2a..cfc0419123193f2bc074af652a6d6a182bcc2e17 100644 --- a/tezt/_regressions/encoding/ithaca.gas.cost.out +++ b/tezt/_regressions/encoding/ithaca.gas.cost.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.gas.cost.out -./tezos-codec encode 012-PsiThaCa.gas.cost from '"8920392083423078"' +./tezos-codec encode 012-Psithaca.gas.cost from '"8920392083423078"' a6fd9d9694c3d81f -./tezos-codec decode 012-PsiThaCa.gas.cost from a6fd9d9694c3d81f +./tezos-codec decode 012-Psithaca.gas.cost from a6fd9d9694c3d81f "8920392083423078" -./tezos-codec encode 012-PsiThaCa.gas.cost from '"0"' +./tezos-codec encode 012-Psithaca.gas.cost from '"0"' 00 -./tezos-codec decode 012-PsiThaCa.gas.cost from 00 +./tezos-codec decode 012-Psithaca.gas.cost from 00 "0" diff --git a/tezt/_regressions/encoding/ithaca.gas.out b/tezt/_regressions/encoding/ithaca.gas.out index cfdd5113d2f02b65d25369893d93320bb476226f..9c4812a94b21a6f0483a79f371415fa4cd62725b 100644 --- a/tezt/_regressions/encoding/ithaca.gas.out +++ b/tezt/_regressions/encoding/ithaca.gas.out @@ -1,19 +1,19 @@ tezt/_regressions/encoding/ithaca.gas.out -./tezos-codec encode 012-PsiThaCa.gas from '"1238"' +./tezos-codec encode 012-Psithaca.gas from '"1238"' 009613 -./tezos-codec decode 012-PsiThaCa.gas from 009613 +./tezos-codec decode 012-Psithaca.gas from 009613 "1238" -./tezos-codec encode 012-PsiThaCa.gas from '"unaccounted"' +./tezos-codec encode 012-Psithaca.gas from '"unaccounted"' 01 -./tezos-codec decode 012-PsiThaCa.gas from 01 +./tezos-codec decode 012-Psithaca.gas from 01 "unaccounted" -./tezos-codec encode 012-PsiThaCa.gas from '"0"' +./tezos-codec encode 012-Psithaca.gas from '"0"' 0000 -./tezos-codec decode 012-PsiThaCa.gas from 0000 +./tezos-codec decode 012-Psithaca.gas from 0000 "0" diff --git a/tezt/_regressions/encoding/ithaca.level.out b/tezt/_regressions/encoding/ithaca.level.out index 54a01e8eb64d6e34dbb98447ff9287c36bb05a0a..d11907ee948f5fd2f6f9d3c99023d8e3c98c0420 100644 --- a/tezt/_regressions/encoding/ithaca.level.out +++ b/tezt/_regressions/encoding/ithaca.level.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.level.out -./tezos-codec encode 012-PsiThaCa.level from '{ +./tezos-codec encode 012-Psithaca.level from '{ "level": 1331, "level_position": 2147483647, "cycle": 300, @@ -9,6 +9,6 @@ tezt/_regressions/encoding/ithaca.level.out }' 000005337fffffff0000012c00000258ff -./tezos-codec decode 012-PsiThaCa.level from 000005337fffffff0000012c00000258ff +./tezos-codec decode 012-Psithaca.level from 000005337fffffff0000012c00000258ff { "level": 1331, "level_position": 2147483647, "cycle": 300, "cycle_position": 600, "expected_commitment": true } diff --git a/tezt/_regressions/encoding/ithaca.nonce.out b/tezt/_regressions/encoding/ithaca.nonce.out index 60aa8caf7ccb73e1476e681cff7d8b6ec92fa092..429f3db14a7b316fdfe5e56c70d59f55928bf201 100644 --- a/tezt/_regressions/encoding/ithaca.nonce.out +++ b/tezt/_regressions/encoding/ithaca.nonce.out @@ -1,7 +1,7 @@ tezt/_regressions/encoding/ithaca.nonce.out -./tezos-codec encode 012-PsiThaCa.nonce from '"0000000000000000000000000000000000000000000000000000000000000000"' +./tezos-codec encode 012-Psithaca.nonce from '"0000000000000000000000000000000000000000000000000000000000000000"' 0000000000000000000000000000000000000000000000000000000000000000 -./tezos-codec decode 012-PsiThaCa.nonce from 0000000000000000000000000000000000000000000000000000000000000000 +./tezos-codec decode 012-Psithaca.nonce from 0000000000000000000000000000000000000000000000000000000000000000 "0000000000000000000000000000000000000000000000000000000000000000" diff --git a/tezt/_regressions/encoding/ithaca.operation.internal.out b/tezt/_regressions/encoding/ithaca.operation.internal.out index ce38e9aa87c9f32cc8e6ad6a8aa77bfd9a18b3cf..55d157f3587529a28efde4fe0a08bf728d7566f0 100644 --- a/tezt/_regressions/encoding/ithaca.operation.internal.out +++ b/tezt/_regressions/encoding/ithaca.operation.internal.out @@ -1,17 +1,17 @@ tezt/_regressions/encoding/ithaca.operation.internal.out -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "delegation" }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000300 -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000300 +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000300 { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "delegation" } -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "delegation", @@ -19,11 +19,11 @@ tezt/_regressions/encoding/ithaca.operation.internal.out }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000003ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000003ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000003ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "delegation", "delegate": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" } -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "origination", @@ -86,7 +86,7 @@ tezt/_regressions/encoding/ithaca.operation.internal.out }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000002af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000002af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000002af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "origination", "balance": "84143", "delegate": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", @@ -103,7 +103,7 @@ tezt/_regressions/encoding/ithaca.operation.internal.out { "prim": "PAIR" } ] ] } ], "storage": [ { "string": "test" } ] } } -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "reveal", @@ -111,12 +111,12 @@ tezt/_regressions/encoding/ithaca.operation.internal.out }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000000004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000000004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac78000000004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "reveal", "public_key": "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" } -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 3, "kind": "transaction", @@ -125,12 +125,12 @@ tezt/_regressions/encoding/ithaca.operation.internal.out }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac780003019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac780003019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac780003019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 3, "kind": "transaction", "amount": "407", "destination": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" } -./tezos-codec encode 012-PsiThaCa.operation.internal from '{ +./tezos-codec encode 012-Psithaca.operation.internal from '{ "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "transaction", @@ -147,7 +147,7 @@ tezt/_regressions/encoding/ithaca.operation.internal.out }' 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f -./tezos-codec decode 012-PsiThaCa.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f +./tezos-codec decode 012-Psithaca.operation.internal from 000002298c03ed7d454a101eb7022bc95f7e5f41ac7800000197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f { "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "nonce": 0, "kind": "transaction", "amount": "407", "destination": "KT1DieU51jzXLerQx5AqMCiLC1SsCeM8yRat", diff --git a/tezt/_regressions/encoding/ithaca.operation.out b/tezt/_regressions/encoding/ithaca.operation.out index 032fa759755e812118fe91e3b86e934f6710a1f8..bb0c49e250f617790c9142f3d42b6a92a61fe3b1 100644 --- a/tezt/_regressions/encoding/ithaca.operation.out +++ b/tezt/_regressions/encoding/ithaca.operation.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.operation.out -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -13,7 +13,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "activate_account", @@ -22,7 +22,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -37,7 +37,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c0066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c0066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c0066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "ballot", "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", @@ -47,7 +47,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -63,7 +63,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4010066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4010066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4010066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "delegation", @@ -73,7 +73,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -90,7 +90,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7866804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "delegation", @@ -101,7 +101,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -148,7 +148,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "double_baking_evidence", @@ -185,7 +185,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -218,7 +218,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "double_endorsement_evidence", @@ -241,7 +241,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -256,7 +256,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "endorsement", "slot": 0, "level": 1331, "round": 0, @@ -265,7 +265,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -280,7 +280,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "endorsement", "slot": 0, "level": 1331, "round": 0, @@ -289,7 +289,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -361,7 +361,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e020000000901000000047465737466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e020000000901000000047465737466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e020000000901000000047465737466804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "origination", @@ -385,7 +385,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -402,7 +402,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "proposals", @@ -413,7 +413,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -430,7 +430,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "reveal", "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", @@ -441,7 +441,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -454,7 +454,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a80100000533000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a80100000533000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a80100000533000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "seed_nonce_revelation", "level": 1331, @@ -463,7 +463,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -481,7 +481,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac780066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac780066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac780066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "transaction", @@ -492,7 +492,7 @@ tezt/_regressions/encoding/ithaca.operation.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } -./tezos-codec encode 012-PsiThaCa.operation from '{ +./tezos-codec encode 012-Psithaca.operation from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -518,7 +518,7 @@ tezt/_regressions/encoding/ithaca.operation.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f66804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "transaction", diff --git a/tezt/_regressions/encoding/ithaca.operation.raw.out b/tezt/_regressions/encoding/ithaca.operation.raw.out index c03ab2b66660fad7c449deef865d835ed1680f65..dee67655b5aeb4345c7b5f84f349ed26cd1b42a0 100644 --- a/tezt/_regressions/encoding/ithaca.operation.raw.out +++ b/tezt/_regressions/encoding/ithaca.operation.raw.out @@ -1,12 +1,12 @@ tezt/_regressions/encoding/ithaca.operation.raw.out -./tezos-codec encode 012-PsiThaCa.operation.raw from '{ +./tezos-codec encode 012-Psithaca.operation.raw from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "data": "000000053366804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c" }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000053366804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation.raw from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000053366804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation.raw from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000053366804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "data": "000000053366804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c" } diff --git a/tezt/_regressions/encoding/ithaca.operation.unsigned.out b/tezt/_regressions/encoding/ithaca.operation.unsigned.out index b1c02cec24aa0e432a89db58733966aaf45b10da..50538eabd811499a7806017cccd55591dc64cc41 100644 --- a/tezt/_regressions/encoding/ithaca.operation.unsigned.out +++ b/tezt/_regressions/encoding/ithaca.operation.unsigned.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -12,14 +12,14 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac4 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac4 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a804c55cf02dbeecc978d9c84625dcae72bb77ea4fbd41f98b15efc63fa893d61d7d6eee4a2ce9427ac4 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "activate_account", "pkh": "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv", "secret": "41f98b15efc63fa893d61d7d6eee4a2ce9427ac4" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -33,7 +33,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c00 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c00 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8060002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c00 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "ballot", "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", @@ -41,7 +41,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "proposal": "PscqRYywd243M2eZspXZEJGsRmNchp4ZKfKmoyEZTRHeLQvVGjp", "ballot": "yay" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -56,7 +56,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40100 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40100 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40100 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "delegation", @@ -64,7 +64,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "counter": "732", "gas_limit": "9451117", "storage_limit": "57024931117" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -80,7 +80,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86e0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401ff0002298c03ed7d454a101eb7022bc95f7e5f41ac78 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "delegation", @@ -89,7 +89,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "storage_limit": "57024931117", "delegate": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -135,7 +135,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a803000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c000000f100000533010e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8000000005e9dcbb00442e9bc4583d4f9fa6ba422733f45d3a44397141a953d2237bf8df62e5046eef700000011000000010100000008000000000000000a4c7319284b55068bb7c4e0b9f8585729db7fb27ab4ca9cff2038a1fc324f650c000000000000000000000000000000000000000000000000000000000000000000000000101895ca00000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "double_baking_evidence", @@ -170,7 +170,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -202,7 +202,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8020000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c0000008b0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a81500000000053300000000000000000000000000000000000000000000000000000000000000000000000066804fe735e06e97e26da8236b6341b91c625d5e82b3524ec0a88cc982365e70f8a5b9bc65df2ea6d21ee244cc3a96fb33031c394c78b1179ff1b8a44237740c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "double_endorsement_evidence", @@ -223,7 +223,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "signature": "sigbQ5ZNvkjvGssJgoAnUAfY4Wvvg3QZqawBYB1j1VDBNTMBAALnCzRHWzer34bnfmzgHg3EvwdzQKdxgSghB897cono6gbQ" } } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -237,14 +237,14 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a815000000000533000000000000000000000000000000000000000000000000000000000000000000000000 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a815000000000533000000000000000000000000000000000000000000000000000000000000000000000000 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a815000000000533000000000000000000000000000000000000000000000000000000000000000000000000 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "endorsement", "slot": 0, "level": 1331, "round": 0, "block_payload_hash": "vh1g87ZG6scSYxKhspAUzprQVuLAyoa5qMBKcUfjgnQGnFb3dJcG" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -315,7 +315,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86d0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401af9105ff0002298c03ed7d454a101eb7022bc95f7e5f41ac7800000020020000001b050003680501056303680502020000000a03160346053d036d03420000000e0200000009010000000474657374 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "origination", @@ -337,7 +337,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out { "prim": "PAIR" } ] ] } ], "storage": [ { "string": "test" } ] } } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -353,7 +353,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8050002298c03ed7d454a101eb7022bc95f7e5f41ac78000002cf000000407663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c7663cf120f3dc8189d5dc7d4d7a0483bcc53f3f18e700f5a2f5076aa8b9dc55c { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "proposals", @@ -362,7 +362,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out [ "PscqRYywd243M2eZspXZEJGsRmNchp4ZKfKmoyEZTRHeLQvVGjp", "PscqRYywd243M2eZspXZEJGsRmNchp4ZKfKmoyEZTRHeLQvVGjp" ] } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -378,7 +378,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86b0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d401004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "reveal", "source": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", @@ -387,7 +387,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "public_key": "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -399,14 +399,14 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a801000005330000000000000000000000000000000000000000000000000000000000000000 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a801000005330000000000000000000000000000000000000000000000000000000000000000 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a801000005330000000000000000000000000000000000000000000000000000000000000000 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "seed_nonce_revelation", "level": 1331, "nonce": "0000000000000000000000000000000000000000000000000000000000000000" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -423,7 +423,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d4019703000002298c03ed7d454a101eb7022bc95f7e5f41ac7800 { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "transaction", @@ -432,7 +432,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out "storage_limit": "57024931117", "amount": "407", "destination": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" } ] } -./tezos-codec encode 012-PsiThaCa.operation.unsigned from '{ +./tezos-codec encode 012-Psithaca.operation.unsigned from '{ "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { @@ -457,7 +457,7 @@ tezt/_regressions/encoding/ithaca.operation.unsigned.out }' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f -./tezos-codec decode 012-PsiThaCa.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f +./tezos-codec decode 012-Psithaca.operation.unsigned from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a86c0002298c03ed7d454a101eb7022bc95f7e5f41ac7821dc05edecc004adcacdb7d40197030138560805b4c8d7b7fbbafad5c59dbfa3878ca70500ffff06616374696f6e000000070200000002034f { "branch": "BKpbfCvh777DQHnXjU2sqHvVUNZ7dBAdqEfKkdw8EGSkD9LSYXb", "contents": [ { "kind": "transaction", diff --git a/tezt/_regressions/encoding/ithaca.period.out b/tezt/_regressions/encoding/ithaca.period.out index 8a4e548a85863ea478fb3255e530aaf11948f76a..86ea5c1565a3fa539ba355bc3cdb70121b765b59 100644 --- a/tezt/_regressions/encoding/ithaca.period.out +++ b/tezt/_regressions/encoding/ithaca.period.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.period.out -./tezos-codec encode 012-PsiThaCa.period from '"2789"' +./tezos-codec encode 012-Psithaca.period from '"2789"' 0000000000000ae5 -./tezos-codec decode 012-PsiThaCa.period from 0000000000000ae5 +./tezos-codec decode 012-Psithaca.period from 0000000000000ae5 "2789" -./tezos-codec encode 012-PsiThaCa.period from '"0"' +./tezos-codec encode 012-Psithaca.period from '"0"' 0000000000000000 -./tezos-codec decode 012-PsiThaCa.period from 0000000000000000 +./tezos-codec decode 012-Psithaca.period from 0000000000000000 "0" diff --git a/tezt/_regressions/encoding/ithaca.raw_level.out b/tezt/_regressions/encoding/ithaca.raw_level.out index 688e185983de8ee10f1a0d14582ebd329306c8a0..8e9c7c040cc050257daae99a9520a187b60a8d30 100644 --- a/tezt/_regressions/encoding/ithaca.raw_level.out +++ b/tezt/_regressions/encoding/ithaca.raw_level.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.raw_level.out -./tezos-codec encode 012-PsiThaCa.raw_level from 2147483647 +./tezos-codec encode 012-Psithaca.raw_level from 2147483647 7fffffff -./tezos-codec decode 012-PsiThaCa.raw_level from 7fffffff +./tezos-codec decode 012-Psithaca.raw_level from 7fffffff 2147483647 -./tezos-codec encode 012-PsiThaCa.raw_level from 0 +./tezos-codec encode 012-Psithaca.raw_level from 0 00000000 -./tezos-codec decode 012-PsiThaCa.raw_level from 00000000 +./tezos-codec decode 012-Psithaca.raw_level from 00000000 0 diff --git a/tezt/_regressions/encoding/ithaca.seed.out b/tezt/_regressions/encoding/ithaca.seed.out index e8dfc5f38a6da744c8eb6443e8c20e8aa52830be..11249e6419612b3f1c458b4750a35d726cdeeecb 100644 --- a/tezt/_regressions/encoding/ithaca.seed.out +++ b/tezt/_regressions/encoding/ithaca.seed.out @@ -1,7 +1,7 @@ tezt/_regressions/encoding/ithaca.seed.out -./tezos-codec encode 012-PsiThaCa.seed from '"0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8"' +./tezos-codec encode 012-Psithaca.seed from '"0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8"' 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8 -./tezos-codec decode 012-PsiThaCa.seed from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8 +./tezos-codec decode 012-Psithaca.seed from 0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8 "0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8" diff --git a/tezt/_regressions/encoding/ithaca.tez.out b/tezt/_regressions/encoding/ithaca.tez.out index 05e47195031c9edba36b30c3dce088b0dcd7c313..ebf0dbd9996cd62d8c18f7557cbb9c4bf84f81f0 100644 --- a/tezt/_regressions/encoding/ithaca.tez.out +++ b/tezt/_regressions/encoding/ithaca.tez.out @@ -1,13 +1,13 @@ tezt/_regressions/encoding/ithaca.tez.out -./tezos-codec encode 012-PsiThaCa.tez from '"7322135"' +./tezos-codec encode 012-Psithaca.tez from '"7322135"' 97f4be03 -./tezos-codec decode 012-PsiThaCa.tez from 97f4be03 +./tezos-codec decode 012-Psithaca.tez from 97f4be03 "7322135" -./tezos-codec encode 012-PsiThaCa.tez from '"0"' +./tezos-codec encode 012-Psithaca.tez from '"0"' 00 -./tezos-codec decode 012-PsiThaCa.tez from 00 +./tezos-codec decode 012-Psithaca.tez from 00 "0" diff --git a/tezt/_regressions/encoding/ithaca.timestamp.out b/tezt/_regressions/encoding/ithaca.timestamp.out index b439e3f295bc33ef7ea144e78dcfa3f8b17c348d..c54a51c9244c40cbb74621e44b6b83ba45fa395b 100644 --- a/tezt/_regressions/encoding/ithaca.timestamp.out +++ b/tezt/_regressions/encoding/ithaca.timestamp.out @@ -1,7 +1,7 @@ tezt/_regressions/encoding/ithaca.timestamp.out -./tezos-codec encode 012-PsiThaCa.timestamp from '"2020-04-20T16:19:59Z"' +./tezos-codec encode 012-Psithaca.timestamp from '"2020-04-20T16:19:59Z"' 000000005e9dcbaf -./tezos-codec decode 012-PsiThaCa.timestamp from 000000005e9dcbaf +./tezos-codec decode 012-Psithaca.timestamp from 000000005e9dcbaf "2020-04-20T16:19:59Z" diff --git a/tezt/_regressions/encoding/ithaca.vote.ballot.out b/tezt/_regressions/encoding/ithaca.vote.ballot.out index 987022fe68c4ce985b8f8428dcf81119a942cc14..b5ffbc72ad7dff14290a95ecfe2d8b86da604044 100644 --- a/tezt/_regressions/encoding/ithaca.vote.ballot.out +++ b/tezt/_regressions/encoding/ithaca.vote.ballot.out @@ -1,19 +1,19 @@ tezt/_regressions/encoding/ithaca.vote.ballot.out -./tezos-codec encode 012-PsiThaCa.vote.ballot from '"nay"' +./tezos-codec encode 012-Psithaca.vote.ballot from '"nay"' 01 -./tezos-codec decode 012-PsiThaCa.vote.ballot from 01 +./tezos-codec decode 012-Psithaca.vote.ballot from 01 "nay" -./tezos-codec encode 012-PsiThaCa.vote.ballot from '"pass"' +./tezos-codec encode 012-Psithaca.vote.ballot from '"pass"' 02 -./tezos-codec decode 012-PsiThaCa.vote.ballot from 02 +./tezos-codec decode 012-Psithaca.vote.ballot from 02 "pass" -./tezos-codec encode 012-PsiThaCa.vote.ballot from '"yay"' +./tezos-codec encode 012-Psithaca.vote.ballot from '"yay"' 00 -./tezos-codec decode 012-PsiThaCa.vote.ballot from 00 +./tezos-codec decode 012-Psithaca.vote.ballot from 00 "yay" diff --git a/tezt/_regressions/encoding/ithaca.vote.ballots.out b/tezt/_regressions/encoding/ithaca.vote.ballots.out index b639700d0dcf6aa7a7515c9081784f03e43f6b62..3ffc0a4b23f99aa809d413887f974461322b9dff 100644 --- a/tezt/_regressions/encoding/ithaca.vote.ballots.out +++ b/tezt/_regressions/encoding/ithaca.vote.ballots.out @@ -1,11 +1,11 @@ tezt/_regressions/encoding/ithaca.vote.ballots.out -./tezos-codec encode 012-PsiThaCa.vote.ballots from '{ +./tezos-codec encode 012-Psithaca.vote.ballots from '{ "yay": 2147483647, "nay": 0, "pass": 455 }' 7fffffff00000000000001c7 -./tezos-codec decode 012-PsiThaCa.vote.ballots from 7fffffff00000000000001c7 +./tezos-codec decode 012-Psithaca.vote.ballots from 7fffffff00000000000001c7 { "yay": 2147483647, "nay": 0, "pass": 455 } diff --git a/tezt/_regressions/encoding/ithaca.vote.listings.out b/tezt/_regressions/encoding/ithaca.vote.listings.out index 1dcd8731e4b2eea45de39d2a46ff79e0d6e07919..0eccf918388368e26935fcb4f4138c58f0590480 100644 --- a/tezt/_regressions/encoding/ithaca.vote.listings.out +++ b/tezt/_regressions/encoding/ithaca.vote.listings.out @@ -1,6 +1,6 @@ tezt/_regressions/encoding/ithaca.vote.listings.out -./tezos-codec encode 012-PsiThaCa.vote.listings from '[ +./tezos-codec encode 012-Psithaca.vote.listings from '[ { "pkh": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "rolls": 20115 @@ -12,6 +12,6 @@ tezt/_regressions/encoding/ithaca.vote.listings.out ]' 000000320002298c03ed7d454a101eb7022bc95f7e5f41ac7800004e9300e7670f32038107a59a2b9cfefae36ea21f5aa63c00002328 -./tezos-codec decode 012-PsiThaCa.vote.listings from 000000320002298c03ed7d454a101eb7022bc95f7e5f41ac7800004e9300e7670f32038107a59a2b9cfefae36ea21f5aa63c00002328 +./tezos-codec decode 012-Psithaca.vote.listings from 000000320002298c03ed7d454a101eb7022bc95f7e5f41ac7800004e9300e7670f32038107a59a2b9cfefae36ea21f5aa63c00002328 [ { "pkh": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", "rolls": 20115 }, { "pkh": "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN", "rolls": 9000 } ] diff --git a/tezt/_regressions/encoding/ithaca.voting_period.kind.out b/tezt/_regressions/encoding/ithaca.voting_period.kind.out index e4b6a3df87f11a65754d9a55324668316d69f2e9..de08e61d9a30d19086adea87b58da2f7ed0bd02a 100644 --- a/tezt/_regressions/encoding/ithaca.voting_period.kind.out +++ b/tezt/_regressions/encoding/ithaca.voting_period.kind.out @@ -1,25 +1,25 @@ tezt/_regressions/encoding/ithaca.voting_period.kind.out -./tezos-codec encode 012-PsiThaCa.voting_period.kind from '"promotion"' +./tezos-codec encode 012-Psithaca.voting_period.kind from '"promotion"' 03 -./tezos-codec decode 012-PsiThaCa.voting_period.kind from 03 +./tezos-codec decode 012-Psithaca.voting_period.kind from 03 "promotion" -./tezos-codec encode 012-PsiThaCa.voting_period.kind from '"proposal"' +./tezos-codec encode 012-Psithaca.voting_period.kind from '"proposal"' 00 -./tezos-codec decode 012-PsiThaCa.voting_period.kind from 00 +./tezos-codec decode 012-Psithaca.voting_period.kind from 00 "proposal" -./tezos-codec encode 012-PsiThaCa.voting_period.kind from '"exploration"' +./tezos-codec encode 012-Psithaca.voting_period.kind from '"exploration"' 01 -./tezos-codec decode 012-PsiThaCa.voting_period.kind from 01 +./tezos-codec decode 012-Psithaca.voting_period.kind from 01 "exploration" -./tezos-codec encode 012-PsiThaCa.voting_period.kind from '"cooldown"' +./tezos-codec encode 012-Psithaca.voting_period.kind from '"cooldown"' 02 -./tezos-codec decode 012-PsiThaCa.voting_period.kind from 02 +./tezos-codec decode 012-Psithaca.voting_period.kind from 02 "cooldown" diff --git a/tezt/_regressions/encoding/ithaca.voting_period.out b/tezt/_regressions/encoding/ithaca.voting_period.out index f58dc8169d151c77278e7524dccaefdddbe3b306..99fe33507a3692be107babba05e0f72a026dbf2c 100644 --- a/tezt/_regressions/encoding/ithaca.voting_period.out +++ b/tezt/_regressions/encoding/ithaca.voting_period.out @@ -1,21 +1,21 @@ tezt/_regressions/encoding/ithaca.voting_period.out -./tezos-codec encode 012-PsiThaCa.voting_period from '{ +./tezos-codec encode 012-Psithaca.voting_period from '{ "start_position": 1159026, "kind": "proposal", "index": 0 }' 00000000000011af72 -./tezos-codec decode 012-PsiThaCa.voting_period from 00000000000011af72 +./tezos-codec decode 012-Psithaca.voting_period from 00000000000011af72 { "index": 0, "kind": "proposal", "start_position": 1159026 } -./tezos-codec encode 012-PsiThaCa.voting_period from '{ +./tezos-codec encode 012-Psithaca.voting_period from '{ "start_position": 0, "kind": "proposal", "index": 0 }' 000000000000000000 -./tezos-codec decode 012-PsiThaCa.voting_period from 000000000000000000 +./tezos-codec decode 012-Psithaca.voting_period from 000000000000000000 { "index": 0, "kind": "proposal", "start_position": 0 } diff --git a/tezt/lib_tezos/protocol.ml b/tezt/lib_tezos/protocol.ml index 4c513288a06a7910d0e9d9d45e9ab1d959aa8b49..d085236d97d1b7eb77acdc96a16aa4c72024841e 100644 --- a/tezt/lib_tezos/protocol.ml +++ b/tezt/lib_tezos/protocol.ml @@ -40,7 +40,7 @@ let tag protocol = String.lowercase_ascii (name protocol) let hash = function | Alpha -> "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" | Hangzhou -> "PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx" - | Ithaca -> "PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP" + | Ithaca -> "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A" let default_constants = Constants_sandbox @@ -55,14 +55,14 @@ let parameter_file ?(constants = default_constants) protocol = match protocol with | Alpha -> "proto_alpha" | Hangzhou -> "proto_011_PtHangz2" - | Ithaca -> "proto_012_PsiThaCa" + | Ithaca -> "proto_012_Psithaca" in sf "src/%s/parameters/%s-parameters.json" directory name let daemon_name = function | Alpha -> "alpha" | Hangzhou -> "011-PtHangz2" - | Ithaca -> "012-PsiThaCa" + | Ithaca -> "012-Psithaca" let accuser proto = "./tezos-accuser-" ^ daemon_name proto diff --git a/tezt/tests/runtime_script_failure.ml b/tezt/tests/runtime_script_failure.ml index 6a0e9b21f37a60cba73b5e1e3dffa798fe567aa9..3a4d2c01f57b785f98f67c7ac223e2e2193ab40b 100644 --- a/tezt/tests/runtime_script_failure.ml +++ b/tezt/tests/runtime_script_failure.ml @@ -82,11 +82,11 @@ let check_client_force = JSON.(first_operation_result |-> "errors" |=> 0 |-> "contract_code") in (match protocol with - | Alpha -> - (* In Alpha this field is deprecated *) + | Alpha | Ithaca -> + (* In Alpha and Ithaca this field is deprecated *) assert (JSON.(first_failed_script |> as_string = "Deprecated")) - | Hangzhou | Ithaca -> - (* In Hangzhou and Ithaca, this field contains the failed script, it + | Hangzhou -> + (* In Hangzhou this field contains the failed script, it is a sequence of length 3 (parameter, storage, and code). *) assert (JSON.(first_failed_script |> as_list |> List.length = 3))) ; return ()