From 63159f2a5d55185b60175524e96f1d438231fbf6 Mon Sep 17 00:00:00 2001 From: Benjamin Canou Date: Sat, 30 Jun 2018 14:11:22 +0200 Subject: [PATCH] It's the final constants --- src/bin_node/node_config_file.ml | 2 +- src/proto_alpha/lib_protocol/src/constants_repr.ml | 4 ++-- src/proto_alpha/lib_protocol/src/main.ml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index d357969ea..1e9ee7df2 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -86,7 +86,7 @@ let default_p2p_limits : P2p.limits = { } let default_p2p = { - expected_pow = 24. ; + expected_pow = 26. ; bootstrap_peers = ["bootstrap.tezos.com"] ; listen_addr = Some ("[::]:" ^ string_of_int default_p2p_port) ; private_mode = false ; diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml index 584b09f98..a34ccceec 100644 --- a/src/proto_alpha/lib_protocol/src/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml @@ -80,12 +80,12 @@ let default = { blocks_per_roll_snapshot = 256l ; blocks_per_voting_period = 32768l ; time_between_blocks = - List.map Period_repr.of_seconds_exn [ 60L ] ; + List.map Period_repr.of_seconds_exn [ 60L ; 75L ] ; endorsers_per_block = 32 ; hard_gas_limit_per_operation = Z.of_int 400_000 ; hard_gas_limit_per_block = Z.of_int 4_000_000 ; proof_of_work_threshold = - Int64.(sub (shift_left 1L 56) 1L) ; + Int64.(sub (shift_left 1L 46) 1L) ; tokens_per_roll = Tez_repr.(mul_exn one 10_000) ; michelson_maximum_type_size = 1000 ; diff --git a/src/proto_alpha/lib_protocol/src/main.ml b/src/proto_alpha/lib_protocol/src/main.ml index 589583be9..bc308772e 100644 --- a/src/proto_alpha/lib_protocol/src/main.ml +++ b/src/proto_alpha/lib_protocol/src/main.ml @@ -52,7 +52,7 @@ let validation_passes = Alpha_context.Constants.max_revelations_per_block + (* allow 100 wallet activations or denunciations per block *) 100 in Updater.[ { max_size = 32 * 1024 ; max_op = Some 32 } ; (* 32 endorsements *) - { max_size = 64 * 1024 ; max_op = None } ; (* 64k of voting operations *) + { max_size = 32 * 1024 ; max_op = None } ; (* 32k of voting operations *) { max_size = max_anonymous_operations * 1024 ; max_op = Some max_anonymous_operations } ; { max_size = 512 * 1024 ; max_op = None } ] (* 512kB *)