From c2fd13f3abdef6c30e29b76b07df3c9b18edfeb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Fri, 22 Sep 2017 17:46:50 +0200 Subject: [PATCH] Reset the chain --- scripts/alphanet_constants.patch | 12 +++++++++++- scripts/alphanet_version | 2 +- scripts/apply_patch.sh | 4 ++-- src/node/main/node_run_command.ml | 4 ++-- src/node/shell/distributed_db_message.ml | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch index cf25e2c42..605297ed3 100644 --- a/scripts/alphanet_constants.patch +++ b/scripts/alphanet_constants.patch @@ -1,6 +1,16 @@ diff --git a/src/proto/alpha/constants_repr.ml b/src/proto/alpha/constants_repr.ml +index 3780bec2..36f91ff6 100644 --- a/src/proto/alpha/constants_repr.ml +++ b/src/proto/alpha/constants_repr.ml +@@ -15,7 +15,7 @@ let proof_of_work_nonce_size = 8 + let nonce_length = 32 + + let roll_value = +- Tez_repr.of_cents_exn 10000_00L ++ Tez_repr.of_cents_exn 30000_00L + let seed_nonce_revelation_tip = + Tez_repr.of_cents_exn 10_00L + let origination_burn = @@ -50,15 +50,14 @@ let read_public_key s = Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) @@ -13,7 +23,7 @@ diff --git a/src/proto/alpha/constants_repr.ml b/src/proto/alpha/constants_repr. Period_repr.of_seconds_exn - (* One year in seconds *) - Int64.(mul 365L (mul 24L 3600L)) ; -+ Int64.(mul 12L 3600L) ; ++ Int64.(mul 6L 3600L) ; (* 6 hours *) slot_durations = - List.map Period_repr.of_seconds_exn [ 60L ] ; - first_free_mining_slot = 16 ; diff --git a/scripts/alphanet_version b/scripts/alphanet_version index 2c65daa94..c5ddcdcc0 100644 --- a/scripts/alphanet_version +++ b/scripts/alphanet_version @@ -1 +1 @@ -2017-09-21 +2017-09-22 diff --git a/scripts/apply_patch.sh b/scripts/apply_patch.sh index 620743fc1..3eaaa489f 100755 --- a/scripts/apply_patch.sh +++ b/scripts/apply_patch.sh @@ -23,7 +23,7 @@ case "$branch" in patch -p1 < scripts/zeronet.patch cp README.md docs/README.master cp docs/README.zeronet README.md - if has_git; then git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI "; fi + if has_git; then git add docs/README.master; git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI "; fi echo "Done" ;; alphanet) @@ -31,7 +31,7 @@ case "$branch" in patch -p1 < scripts/alphanet_constants.patch cp README.md docs/README.master cp docs/README.alphanet README.md - if has_git; then git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI "; fi + if has_git; then git add docs/README.master; git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI "; fi echo "Done" ;; *) diff --git a/src/node/main/node_run_command.ml b/src/node/main/node_run_command.ml index f1a387955..b19ce7603 100644 --- a/src/node/main/node_run_command.ml +++ b/src/node/main/node_run_command.ml @@ -11,10 +11,10 @@ open Logging.Node.Main let genesis : State.Net.genesis = { time = - Time.of_notation_exn "2017-09-21T00:00:00Z" ; + Time.of_notation_exn "2017-09-22T00:00:00Z" ; block = Block_hash.of_b58check_exn - "BLockGenesisGenesisGenesisGenesisGenesisBBBBBbwcZMg" ; + "BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU" ; protocol = Protocol_hash.of_b58check_exn "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ; diff --git a/src/node/shell/distributed_db_message.ml b/src/node/shell/distributed_db_message.ml index 5b148b59d..f2406ec4b 100644 --- a/src/node/shell/distributed_db_message.ml +++ b/src/node/shell/distributed_db_message.ml @@ -174,7 +174,7 @@ let versions = let open P2p.Version in [ { name = "TEZOS" ; major = 0 ; - minor = 23 ; + minor = 24 ; } ]