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

Fix alphanet_constant.patch and reset the chain

Browse Source
This commit is contained in:
Benjamin Canou 2018-03-09 14:03:07 +01:00
parent 88f5a5fb4d
commit d00724ea13
4 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
scripts/alphanet_constants.patch
View File

@ -1,53 +1,25 @@
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 b1e8af1d..0ff3337e 100644 index 7aedfb62..c9e3881d 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
@@ -67,15 +67,15 @@ let read_public_key s = Ed25519.Public_key.of_hex_exn (`Hex s) @@ -64,15 +64,14 @@ type constants = {
let read_public_key s = Ed25519.Public_key.of_hex_exn (`Hex s)
let default = { let default = {
preserved_cycles = 5 ;
- cycle_length = 2048l ; - cycle_length = 2048l ;
- blocks_per_commitment = 32l ; - voting_period_length = 32768l ;
+ cycle_length = 128l ; + cycle_length = 128l ;
+ blocks_per_commitment = 4l ; + voting_period_length = 1024l ;
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 ; 20L ; 10L ] ;
first_free_baking_slot = 16 ; + first_free_baking_slot = 16 ;
max_signing_slot = 15 ; max_signing_slot = 15 ;
max_gas = 40_000 ; max_gas = 40_000 ;
proof_of_work_threshold =

2
scripts/alphanet_version
View File

@ -1 +1 @@
2018-03-08T06:08:24Z 2018-03-09T13:05:42Z

4
src/bin_node/node_run_command.ml
View File

@ -11,10 +11,10 @@ open Logging.Node.Main
let genesis : State.Chain.genesis = { let genesis : State.Chain.genesis = {
time = time =
Time.of_notation_exn "2018-03-08T06:08:24Z" ; Time.of_notation_exn "2018-03-09T13:05:42Z" ;
block = block =
Block_hash.of_b58check_exn Block_hash.of_b58check_exn
"BLockGenesisGenesisGenesisGenesisGenesisd5f1edmn4BF" ; "BLockGenesisGenesisGenesisGenesisGenesis1962feAyDRw" ;
protocol = protocol =
Protocol_hash.of_b58check_exn Protocol_hash.of_b58check_exn
"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ; "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ;

2
src/lib_shell/distributed_db_message.ml
View File

@ -170,7 +170,7 @@ let encoding =
let versions = let versions =
let open P2p_version in let open P2p_version in
[ { name = "TEZOS_2018-03-08T06:08:24Z" ; [ { name = "TEZOS_2018-03-09T13:05:42Z" ;
major = 0 ; major = 0 ;
minor = 0 ; minor = 0 ;
} }