balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Proto Alpha's hash is its actual hash

Browse Source
This commit is contained in:
Benjamin Canou 2018-06-30 17:27:05 +02:00
parent 12b72c9a0b
commit 252435d280
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docs/api/rpc_proposal.rst
View File

@ -2769,7 +2769,7 @@ Protocol Alpha
</div> </div>
<div id="GET_..--block_idoutput" class="GET_..--block_id tabcontent"> <div id="GET_..--block_idoutput" class="GET_..--block_id tabcontent">
<pre> <pre>
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A block identifier (Base58Check-encoded) */, "hash": string /* A block identifier (Base58Check-encoded) */,
"header": $raw_block_header, "header": $raw_block_header,
@ -2799,8 +2799,8 @@ Protocol Alpha
string string
/* A Secp256k1 or Ed25519 signature (Base58Check-encoded) */ } /* A Secp256k1 or Ed25519 signature (Base58Check-encoded) */ }
$block_header_metadata: $block_header_metadata:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"next_protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", "next_protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"test_chain_status": "test_chain_status":
/* Test chain status */ /* Test chain status */
{ "status": "not_running" } { "status": "not_running" }
@ -2962,7 +2962,7 @@ Protocol Alpha
"args": [ $micheline.michelson_v1.expression ... ], "args": [ $micheline.michelson_v1.expression ... ],
"annot"?: string } "annot"?: string }
$operation: $operation:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A Tezos operation ID (Base58Check-encoded) */, "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,
@ -4598,7 +4598,7 @@ Protocol Alpha
<pre> <pre>
$block_header $block_header
$block_header: $block_header:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A block identifier (Base58Check-encoded) */, "hash": string /* A block identifier (Base58Check-encoded) */,
"level": integer ∈ [-2^31-2, 2^31+2], "level": integer ∈ [-2^31-2, 2^31+2],
@ -4640,7 +4640,7 @@ Protocol Alpha
</div> </div>
<div id="GET_..--block_id--header--protocol_dataoutput" class="GET_..--block_id--header--protocol_data tabcontent"> <div id="GET_..--block_id--header--protocol_dataoutput" class="GET_..--block_id--header--protocol_data tabcontent">
<pre> <pre>
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"priority": integer ∈ [0, 2^16-1], "priority": integer ∈ [0, 2^16-1],
"proof_of_work_nonce": /^[a-zA-Z0-9]+$/, "proof_of_work_nonce": /^[a-zA-Z0-9]+$/,
"seed_nonce_hash"?: string /* A nonce hash (Base58Check-encoded) */, "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"> <div id="POST_..--block_id--helpers--preapply--blockinput" class="POST_..--block_id--helpers--preapply--block tabcontent">
<pre> <pre>
{ "protocol_data": { "protocol_data":
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"priority": integer ∈ [0, 2^16-1], "priority": integer ∈ [0, 2^16-1],
"proof_of_work_nonce": /^[a-zA-Z0-9]+$/, "proof_of_work_nonce": /^[a-zA-Z0-9]+$/,
"seed_nonce_hash"?: string /* A nonce hash (Base58Check-encoded) */, "seed_nonce_hash"?: string /* A nonce hash (Base58Check-encoded) */,
@ -5812,7 +5812,7 @@ Protocol Alpha
"annot"?: string } "annot"?: string }
$next_operation: $next_operation:
/* Operations param */ /* Operations param */
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,
"contents": [ $operation.alpha.contents ... ], "contents": [ $operation.alpha.contents ... ],
"signature"?: "signature"?:
@ -6157,7 +6157,7 @@ Protocol Alpha
"annot"?: string } "annot"?: string }
$next_operation: $next_operation:
/* Operations param */ /* Operations param */
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,
"contents": [ $operation.alpha.contents ... ], "contents": [ $operation.alpha.contents ... ],
"signature"?: "signature"?:
@ -7924,8 +7924,8 @@ Protocol Alpha
<pre> <pre>
$block_header_metadata $block_header_metadata
$block_header_metadata: $block_header_metadata:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"next_protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", "next_protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"test_chain_status": "test_chain_status":
/* Test chain status */ /* Test chain status */
{ "status": "not_running" } { "status": "not_running" }
@ -8084,7 +8084,7 @@ Protocol Alpha
</div> </div>
<div id="GET_..--block_id--metadata--protocol_dataoutput" class="GET_..--block_id--metadata--protocol_data tabcontent"> <div id="GET_..--block_id--metadata--protocol_dataoutput" class="GET_..--block_id--metadata--protocol_data tabcontent">
<pre> <pre>
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"baker": "baker":
string string
/* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */,
@ -8375,7 +8375,7 @@ Protocol Alpha
"args": [ $micheline.michelson_v1.expression ... ], "args": [ $micheline.michelson_v1.expression ... ],
"annot"?: string } "annot"?: string }
$operation: $operation:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A Tezos operation ID (Base58Check-encoded) */, "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,
@ -8831,7 +8831,7 @@ Protocol Alpha
"args": [ $micheline.michelson_v1.expression ... ], "args": [ $micheline.michelson_v1.expression ... ],
"annot"?: string } "annot"?: string }
$operation: $operation:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A Tezos operation ID (Base58Check-encoded) */, "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,
@ -9287,7 +9287,7 @@ Protocol Alpha
"args": [ $micheline.michelson_v1.expression ... ], "args": [ $micheline.michelson_v1.expression ... ],
"annot"?: string } "annot"?: string }
$operation: $operation:
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"chain_id": string /* Network identifier (Base58Check-encoded) */, "chain_id": string /* Network identifier (Base58Check-encoded) */,
"hash": string /* A Tezos operation ID (Base58Check-encoded) */, "hash": string /* A Tezos operation ID (Base58Check-encoded) */,
"branch": string /* A block identifier (Base58Check-encoded) */, "branch": string /* A block identifier (Base58Check-encoded) */,

2
docs/doc_gen/p2p_doc.ml
View File

@ -24,7 +24,7 @@
(*****************************************************************************) (*****************************************************************************)
let protocols = [ let protocols = [
"Alpha", "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" ; "Alpha", "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" ;
] ]
let main _node = let main _node =

2
docs/doc_gen/rpc_doc.ml
View File

@ -24,7 +24,7 @@
(*****************************************************************************) (*****************************************************************************)
let protocols = [ let protocols = [
"Alpha", "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" ; "Alpha", "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" ;
] ]
let pp_name ppf = function let pp_name ppf = function

2
docs/introduction/howto.rst
View File

@ -256,7 +256,7 @@ activating the whole network. For instance:
$ tezos-activate-alpha $ tezos-activate-alpha
Injected BMBcK869jaHQDc Injected BMBcK869jaHQDc
$ tezos-client rpc get /chains/main/blocks/head/metadata/next_protocol_hash $ tezos-client rpc get /chains/main/blocks/head/metadata/next_protocol_hash
{ "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" } { "protocol": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY" }
Tune protocol alpha parameters Tune protocol alpha parameters
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
src/bin_client/test/test_multinode.sh
View File

@ -39,7 +39,7 @@ activate_alpha
printf "\n\n" printf "\n\n"
retry 2 15 assert_protocol "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK" retry 2 15 assert_protocol "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY"
$client1 bake for bootstrap1 --max-priority 512 --minimal-timestamp $client1 bake for bootstrap1 --max-priority 512 --minimal-timestamp
retry 2 15 assert_propagation_level 2 retry 2 15 assert_propagation_level 2

4
src/bin_client/tezos-init-sandboxed-client.sh
View File

@ -247,7 +247,7 @@ activate_alpha() {
${client} \ ${client} \
-block genesis \ -block genesis \
activate protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK \ activate protocol PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY \
with fitness 1 \ with fitness 1 \
and key activator \ and key activator \
and parameters "${parameters_file}" \ and parameters "${parameters_file}" \
@ -320,7 +320,7 @@ main () {
cat <<EOF cat <<EOF
if type tezos-client-reset >/dev/null 2>&1 ; then tezos-client-reset; fi ; if type tezos-client-reset >/dev/null 2>&1 ; then tezos-client-reset; fi ;
PATH="$client_dir/bin:\$PATH" ; export PATH ; 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-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\"" ; alias tezos-autocomplete="if [ \$ZSH_NAME ] ; then autoload bashcompinit ; bashcompinit ; fi ; source \"$bin_dir/bash-completion.sh\"" ;
trap tezos-client-reset EXIT ; trap tezos-client-reset EXIT ;

2
src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL
View File

@ -1,5 +1,5 @@
{ {
"hash": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", "hash": "PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY",
"modules": [ "modules": [
"Misc", "Misc",
"Storage_description", "Storage_description",