From 6c00f64dfb317e62f6d1d5e04a62df6b415a26b4 Mon Sep 17 00:00:00 2001 From: Benjamin Canou Date: Sat, 30 Jun 2018 17:33:28 +0200 Subject: [PATCH] Proto Genesis's hash is its actual hash --- docs/doc_gen/node_helpers.ml | 2 +- docs/introduction/howto.rst | 2 +- src/bin_client/tezos-init-sandboxed-client.sh | 2 +- src/bin_node/node_run_command.ml | 2 +- src/proto_genesis/lib_client/client_proto_main.ml | 2 +- src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/doc_gen/node_helpers.ml b/docs/doc_gen/node_helpers.ml index 213a58d50..86f04ec1f 100644 --- a/docs/doc_gen/node_helpers.ml +++ b/docs/doc_gen/node_helpers.ml @@ -31,7 +31,7 @@ let genesis : State.Chain.genesis = { "BLockGenesisGenesisGenesisGenesisGenesisa52f8bUWPcg" ; protocol = Protocol_hash.of_b58check_exn - "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ; + "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" ; } let with_node f = diff --git a/docs/introduction/howto.rst b/docs/introduction/howto.rst index 86420b4b7..67c6213e6 100644 --- a/docs/introduction/howto.rst +++ b/docs/introduction/howto.rst @@ -252,7 +252,7 @@ activating the whole network. For instance: :: $ tezos-client rpc get /chains/main/blocks/head/metadata/next_protocol_hash - { "protocol": "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" } + { "protocol": "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" } $ tezos-activate-alpha Injected BMBcK869jaHQDc $ tezos-client rpc get /chains/main/blocks/head/metadata/next_protocol_hash diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh index 44e7d7609..0b613ca7b 100755 --- a/src/bin_client/tezos-init-sandboxed-client.sh +++ b/src/bin_client/tezos-init-sandboxed-client.sh @@ -336,7 +336,7 @@ tezos node launched with \`launch-sandboxed-node $1\`. For instance: tezos-client rpc get /chains/main/blocks/head/metadata Note: if the current protocol version, as reported by the previous -command, is "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im", you +command, is "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P", you may have to activate in your "sandboxed network" the same economic protocol than used by the alphanet by running: diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml index a4d7ef3ab..4b98f2621 100644 --- a/src/bin_node/node_run_command.ml +++ b/src/bin_node/node_run_command.ml @@ -33,7 +33,7 @@ let genesis : State.Chain.genesis = { "BLockGenesisGenesisGenesisGenesisGenesisa52f8bUWPcg" ; protocol = Protocol_hash.of_b58check_exn - "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ; + "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" ; } type error += Non_private_sandbox of P2p_addr.t diff --git a/src/proto_genesis/lib_client/client_proto_main.ml b/src/proto_genesis/lib_client/client_proto_main.ml index c854c6340..acbceb871 100644 --- a/src/proto_genesis/lib_client/client_proto_main.ml +++ b/src/proto_genesis/lib_client/client_proto_main.ml @@ -27,7 +27,7 @@ open Proto_genesis let protocol = Protocol_hash.of_b58check_exn - "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" + "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" let bake cctxt ?(timestamp = Time.now ()) block command sk = let protocol_data = { command ; signature = Signature.zero } in diff --git a/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL b/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL index c58b2f113..049013d7b 100644 --- a/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL +++ b/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL @@ -1,4 +1,4 @@ { - "hash": "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im", + "hash": "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P", "modules": ["Data", "Services", "Main"] }