From b8f8b598cd1164c7b55afb1586d3108cc968d31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Wed, 7 Mar 2018 08:45:52 +0100 Subject: [PATCH] Fix alphanet_constant.patch --- scripts/alphanet_constants.patch | 56 ++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch index 358d402b9..2dfba8983 100644 --- a/scripts/alphanet_constants.patch +++ b/scripts/alphanet_constants.patch @@ -1,25 +1,53 @@ +diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch +index 358d402b..e69de29b 100644 +--- a/scripts/alphanet_constants.patch ++++ b/scripts/alphanet_constants.patch +@@ -1,25 +0,0 @@ +-diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml +-index 61e79c8a..f91ce282 100644 +---- a/src/proto_alpha/lib_protocol/src/constants_repr.ml +-+++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml +-@@ -49,15 +49,14 @@ let read_public_key s = +- Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) +- +- let default = { +-- cycle_length = 2048l ; +-- voting_period_length = 32768l ; +-+ cycle_length = 64l ; +-+ voting_period_length = 1024l ; +- time_before_reward = +- Period_repr.of_seconds_exn +-- (* One year in seconds *) +-- Int64.(mul 365L (mul 24L 3600L)) ; +-+ Int64.(mul 6L 3600L) ; (* 6 hours *) +- slot_durations = +-- List.map Period_repr.of_seconds_exn [ 60L ] ; +-- first_free_baking_slot = 16 ; +-+ List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 30L ; 30L ; 10L ] ; +-+ first_free_baking_slot = 4 ; +- max_signing_slot = 15 ; +- instructions_per_transaction = 16 * 1024 ; +- proof_of_work_threshold = diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml -index 61e79c8a..f91ce282 100644 +index b1e8af1d..0ff3337e 100644 --- a/src/proto_alpha/lib_protocol/src/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml -@@ -49,15 +49,14 @@ let read_public_key s = - Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) +@@ -67,15 +67,15 @@ let read_public_key s = Ed25519.Public_key.of_hex_exn (`Hex s) let default = { + preserved_cycles = 5 ; - cycle_length = 2048l ; -- voting_period_length = 32768l ; -+ cycle_length = 64l ; -+ voting_period_length = 1024l ; +- blocks_per_commitment = 32l ; ++ cycle_length = 128l ; ++ blocks_per_commitment = 4l ; + voting_period_length = 32768l ; time_before_reward = Period_repr.of_seconds_exn -- (* One year in seconds *) -- Int64.(mul 365L (mul 24L 3600L)) ; -+ Int64.(mul 6L 3600L) ; (* 6 hours *) + (* One year in seconds *) + Int64.(mul 365L (mul 24L 3600L)) ; slot_durations = - List.map Period_repr.of_seconds_exn [ 60L ] ; -- first_free_baking_slot = 16 ; -+ List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 30L ; 30L ; 10L ] ; -+ first_free_baking_slot = 4 ; ++ List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 20L ; 10L ] ; + first_free_baking_slot = 16 ; max_signing_slot = 15 ; - instructions_per_transaction = 16 * 1024 ; - proof_of_work_threshold = + max_gas = 40_000 ;