From 252435d28048408c5f6528256e5edce24dd8d075 Mon Sep 17 00:00:00 2001
From: Benjamin Canou <benjamin@canou.fr>
Date: Sat, 30 Jun 2018 17:27:05 +0200
Subject: [PATCH] Proto Alpha's hash is its actual hash

---
 docs/api/rpc_proposal.rst                     | 30 +++++++++----------
 docs/doc_gen/p2p_doc.ml                       |  2 +-
 docs/doc_gen/rpc_doc.ml                       |  2 +-
 docs/introduction/howto.rst                   |  2 +-
 src/bin_client/test/test_multinode.sh         |  2 +-
 src/bin_client/tezos-init-sandboxed-client.sh |  4 +--
 .../lib_protocol/src/TEZOS_PROTOCOL           |  2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/api/rpc_proposal.rst b/docs/api/rpc_proposal.rst
index 38c9be402..e720208b1 100644
--- a/docs/api/rpc_proposal.rst
+++ b/docs/api/rpc_proposal.rst
@@ -2769,7 +2769,7 @@ Protocol Alpha
             </div>
   <div id="GET_..--block_idoutput" class="GET_..--block_id tabcontent">
     <pre>
-    { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+    { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
       "chain_id": string /* Network identifier (Base58Check-encoded) */,
       "hash": string /* A block identifier (Base58Check-encoded) */,
       "header": $raw_block_header,
@@ -2799,8 +2799,8 @@ Protocol Alpha
           string
           /* A Secp256k1 or Ed25519 signature (Base58Check-encoded) */ }
     $block_header_metadata:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
-        "next_protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
+        "next_protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "test_chain_status":
           /* Test chain status */
           { "status": "not_running" }
@@ -2962,7 +2962,7 @@ Protocol Alpha
            "args": [ $micheline.michelson_v1.expression ... ],
            "annot"?: string }
     $operation:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "chain_id": string /* Network identifier (Base58Check-encoded) */,
         "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
         "branch": string /* A block identifier (Base58Check-encoded) */,
@@ -4598,7 +4598,7 @@ Protocol Alpha
     <pre>
     $block_header
     $block_header:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "chain_id": string /* Network identifier (Base58Check-encoded) */,
         "hash": string /* A block identifier (Base58Check-encoded) */,
         "level": integer ∈ [-2^31-2, 2^31+2],
@@ -4640,7 +4640,7 @@ Protocol Alpha
             </div>
   <div id="GET_..--block_id--header--protocol_dataoutput" class="GET_..--block_id--header--protocol_data tabcontent">
     <pre>
-    { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+    { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
       "priority": integer ∈ [0, 2^16-1],
       "proof_of_work_nonce": /^[a-zA-Z0-9]+$/,
       "seed_nonce_hash"?: string /* A nonce hash (Base58Check-encoded) */,
@@ -5662,7 +5662,7 @@ Protocol Alpha
   <div id="POST_..--block_id--helpers--preapply--blockinput" class="POST_..--block_id--helpers--preapply--block tabcontent">
     <pre>
     { "protocol_data":
-        { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+        { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
           "priority": integer ∈ [0, 2^16-1],
           "proof_of_work_nonce": /^[a-zA-Z0-9]+$/,
           "seed_nonce_hash"?: string /* A nonce hash (Base58Check-encoded) */,
@@ -5812,7 +5812,7 @@ Protocol Alpha
            "annot"?: string }
     $next_operation:
       /* Operations param */
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "branch": string /* A block identifier (Base58Check-encoded) */,
         "contents": [ $operation.alpha.contents ... ],
         "signature"?:
@@ -6157,7 +6157,7 @@ Protocol Alpha
            "annot"?: string }
     $next_operation:
       /* Operations param */
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "branch": string /* A block identifier (Base58Check-encoded) */,
         "contents": [ $operation.alpha.contents ... ],
         "signature"?:
@@ -7924,8 +7924,8 @@ Protocol Alpha
     <pre>
     $block_header_metadata
     $block_header_metadata:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
-        "next_protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
+        "next_protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "test_chain_status":
           /* Test chain status */
           { "status": "not_running" }
@@ -8084,7 +8084,7 @@ Protocol Alpha
             </div>
   <div id="GET_..--block_id--metadata--protocol_dataoutput" class="GET_..--block_id--metadata--protocol_data tabcontent">
     <pre>
-    { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+    { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
       "baker":
         string
         /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */,
@@ -8375,7 +8375,7 @@ Protocol Alpha
            "args": [ $micheline.michelson_v1.expression ... ],
            "annot"?: string }
     $operation:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "chain_id": string /* Network identifier (Base58Check-encoded) */,
         "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
         "branch": string /* A block identifier (Base58Check-encoded) */,
@@ -8831,7 +8831,7 @@ Protocol Alpha
            "args": [ $micheline.michelson_v1.expression ... ],
            "annot"?: string }
     $operation:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "chain_id": string /* Network identifier (Base58Check-encoded) */,
         "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
         "branch": string /* A block identifier (Base58Check-encoded) */,
@@ -9287,7 +9287,7 @@ Protocol Alpha
            "args": [ $micheline.michelson_v1.expression ... ],
            "annot"?: string }
     $operation:
-      { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+      { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
         "chain_id": string /* Network identifier (Base58Check-encoded) */,
         "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
         "branch": string /* A block identifier (Base58Check-encoded) */,
diff --git a/docs/doc_gen/p2p_doc.ml b/docs/doc_gen/p2p_doc.ml
index 0e13a41b5..df8c99f6b 100644
--- a/docs/doc_gen/p2p_doc.ml
+++ b/docs/doc_gen/p2p_doc.ml
@@ -24,7 +24,7 @@
 (*****************************************************************************)
 
 let protocols = [
-  "Alpha", "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" ;
+  "Alpha", "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" ;
 ]
 
 let main _node =
diff --git a/docs/doc_gen/rpc_doc.ml b/docs/doc_gen/rpc_doc.ml
index 99038248a..cdbb63d4c 100644
--- a/docs/doc_gen/rpc_doc.ml
+++ b/docs/doc_gen/rpc_doc.ml
@@ -24,7 +24,7 @@
 (*****************************************************************************)
 
 let protocols = [
-  "Alpha", "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" ;
+  "Alpha", "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" ;
 ]
 
 let pp_name ppf = function
diff --git a/docs/introduction/howto.rst b/docs/introduction/howto.rst
index 1c6602f3a..86420b4b7 100644
--- a/docs/introduction/howto.rst
+++ b/docs/introduction/howto.rst
@@ -256,7 +256,7 @@ activating the whole network. For instance:
     $ tezos-activate-alpha
     Injected BMBcK869jaHQDc
     $ tezos-client rpc get /chains/main/blocks/head/metadata/next_protocol_hash
-    { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" }
+    { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" }
 
 Tune protocol alpha parameters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/bin_client/test/test_multinode.sh b/src/bin_client/test/test_multinode.sh
index 9ef9d5dce..90aab0e61 100755
--- a/src/bin_client/test/test_multinode.sh
+++ b/src/bin_client/test/test_multinode.sh
@@ -39,7 +39,7 @@ activate_alpha
 
 printf "\n\n"
 
-retry 2 15 assert_protocol "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK"
+retry 2 15 assert_protocol "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY"
 
 $client1 bake for bootstrap1 --max-priority 512 --minimal-timestamp
 retry 2 15 assert_propagation_level 2
diff --git a/src/bin_client/tezos-init-sandboxed-client.sh b/src/bin_client/tezos-init-sandboxed-client.sh
index 2af80b60d..44e7d7609 100755
--- a/src/bin_client/tezos-init-sandboxed-client.sh
+++ b/src/bin_client/tezos-init-sandboxed-client.sh
@@ -247,7 +247,7 @@ activate_alpha() {
 
     ${client} \
         -block genesis \
-        activate protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK \
+        activate protocol PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY \
         with fitness 1 \
         and key activator \
 	and parameters "${parameters_file}" \
@@ -320,7 +320,7 @@ main () {
     cat <<EOF
 if type tezos-client-reset >/dev/null 2>&1 ; then tezos-client-reset; fi ;
 PATH="$client_dir/bin:\$PATH" ; export PATH ;
-alias tezos-activate-alpha="$client  -block genesis activate protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK with fitness 1 and key activator and parameters $parameters_file --timestamp $(TZ='AAA+1' date +%FT%TZ)" ;
+alias tezos-activate-alpha="$client  -block genesis activate protocol PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY with fitness 1 and key activator and parameters $parameters_file --timestamp $(TZ='AAA+1' date +%FT%TZ)" ;
 alias tezos-client-reset="rm -rf \"$client_dir\"; unalias tezos-activate-alpha tezos-client-reset" ;
 alias tezos-autocomplete="if [ \$ZSH_NAME ] ; then autoload bashcompinit ; bashcompinit ; fi ; source \"$bin_dir/bash-completion.sh\"" ;
 trap tezos-client-reset EXIT ;
diff --git a/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL
index f096ccd80..8eead51d8 100644
--- a/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL
+++ b/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL
@@ -1,5 +1,5 @@
 {
-    "hash": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK",
+    "hash": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
     "modules": [
         "Misc",
         "Storage_description",