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

Fix alphanet_constant.patch

Browse Source
This commit is contained in:
Grégoire Henry 2018-03-07 08:45:52 +01:00
parent b50d96ec2b
commit b8f8b598cd
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scripts/alphanet_constants.patch
View File

@ -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 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 --- a/src/proto_alpha/lib_protocol/src/constants_repr.ml
+++ b/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 = @@ -67,15 +67,15 @@ let read_public_key s = Ed25519.Public_key.of_hex_exn (`Hex s)
Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s))
let default = { let default = {
preserved_cycles = 5 ;
- cycle_length = 2048l ; - cycle_length = 2048l ;
- voting_period_length = 32768l ; - blocks_per_commitment = 32l ;
+ cycle_length = 64l ; + cycle_length = 128l ;
+ voting_period_length = 1024l ; + blocks_per_commitment = 4l ;
voting_period_length = 32768l ;
time_before_reward = time_before_reward =
Period_repr.of_seconds_exn Period_repr.of_seconds_exn
- (* One year in seconds *) (* One year in seconds *)
- Int64.(mul 365L (mul 24L 3600L)) ; Int64.(mul 365L (mul 24L 3600L)) ;
+ Int64.(mul 6L 3600L) ; (* 6 hours *)
slot_durations = slot_durations =
- List.map Period_repr.of_seconds_exn [ 60L ] ; - List.map Period_repr.of_seconds_exn [ 60L ] ;
- first_free_baking_slot = 16 ; + List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 20L ; 10L ] ;
+ List.map Period_repr.of_seconds_exn [ 60L ; 30L ; 30L ; 30L ; 10L ] ; first_free_baking_slot = 16 ;
+ first_free_baking_slot = 4 ;
max_signing_slot = 15 ; max_signing_slot = 15 ;
instructions_per_transaction = 16 * 1024 ; max_gas = 40_000 ;
proof_of_work_threshold =