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

Alpha: remove unused dictator key

Browse Source
This commit is contained in:
Benjamin Canou 2018-06-29 00:18:26 +02:00
parent bda245f221
commit d5fed56d46
7 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin_client/test/protocol_parameters.json
View File

@ -18,8 +18,6 @@
[ "btz1Q1N2ePwhVw5ED3aaRVek6EBzYs1GDkSVD", "3569618927693" ],
[ "btz1VFFVsVMYHd5WfaDTAt92BeQYGK8Ri4eLy", "9034781424478" ]
],
"dictator_pubkey":
"edpkuSLWfVU1Vq7Jg9FucPyKmma6otcMHac9zG4oU1KMHSTBpJuGQ2",
"time_between_blocks" : [ "1", "0" ],
"blocks_per_cycle" : 128,
"blocks_per_roll_snapshot" : 32,

2
src/proto_alpha/lib_protocol/src/alpha_context.mli
View File

@ -332,7 +332,6 @@ module Constants : sig
hard_gas_limit_per_operation: Z.t ;
hard_gas_limit_per_block: Z.t ;
proof_of_work_threshold: int64 ;
dictator_pubkey: Signature.Public_key.t ;
tokens_per_roll: Tez.t ;
michelson_maximum_type_size: int;
seed_nonce_revelation_tip: Tez.t ;
@ -358,7 +357,6 @@ module Constants : sig
val cost_per_byte: context -> Tez.t
val hard_storage_limit_per_operation: context -> Z.t
val proof_of_work_threshold: context -> int64
val dictator_pubkey: context -> Signature.Public_key.t
val tokens_per_roll: context -> Tez.t
val michelson_maximum_type_size: context -> int
val block_reward: context -> Tez.t

10
src/proto_alpha/lib_protocol/src/constants_repr.ml
View File

@ -61,7 +61,6 @@ type parametric = {
hard_gas_limit_per_operation: Z.t ;
hard_gas_limit_per_block: Z.t ;
proof_of_work_threshold: int64 ;
dictator_pubkey: Signature.Public_key.t ;
tokens_per_roll: Tez_repr.t ;
michelson_maximum_type_size: int;
seed_nonce_revelation_tip: Tez_repr.t ;
@ -87,9 +86,6 @@ let default = {
hard_gas_limit_per_block = Z.of_int 4_000_000 ;
proof_of_work_threshold =
Int64.(sub (shift_left 1L 56) 1L) ;
dictator_pubkey =
Signature.Public_key.of_b58check_exn
"edpkugeDwmwuwyyD3Q5enapgEYDxZLtEUFFSrvVwXASQMVEqsvTqWu" ;
tokens_per_roll =
Tez_repr.(mul_exn one 10_000) ;
michelson_maximum_type_size = 1000 ;
@ -123,7 +119,6 @@ let parametric_encoding =
c.hard_gas_limit_per_operation,
c.hard_gas_limit_per_block),
((c.proof_of_work_threshold,
c.dictator_pubkey,
c.tokens_per_roll,
c.michelson_maximum_type_size,
c.seed_nonce_revelation_tip,
@ -144,7 +139,6 @@ let parametric_encoding =
hard_gas_limit_per_operation,
hard_gas_limit_per_block),
((proof_of_work_threshold,
dictator_pubkey,
tokens_per_roll,
michelson_maximum_type_size,
seed_nonce_revelation_tip,
@ -165,7 +159,6 @@ let parametric_encoding =
hard_gas_limit_per_operation ;
hard_gas_limit_per_block ;
proof_of_work_threshold ;
dictator_pubkey ;
tokens_per_roll ;
michelson_maximum_type_size ;
seed_nonce_revelation_tip ;
@ -189,9 +182,8 @@ let parametric_encoding =
(req "hard_gas_limit_per_operation" z)
(req "hard_gas_limit_per_block" z))
(merge_objs
(obj9
(obj8
(req "proof_of_work_threshold" int64)
(req "dictator_pubkey" Signature.Public_key.encoding)
(req "tokens_per_roll" Tez_repr.encoding)
(req "michelson_maximum_type_size" uint16)
(req "seed_nonce_revelation_tip" Tez_repr.encoding)

3
src/proto_alpha/lib_protocol/src/constants_storage.ml
View File

@ -43,9 +43,6 @@ let hard_storage_limit_per_operation c =
let proof_of_work_threshold c =
let constants = Raw_context.constants c in
constants.proof_of_work_threshold
let dictator_pubkey c =
let constants = Raw_context.constants c in
constants.dictator_pubkey
let tokens_per_roll c =
let constants = Raw_context.constants c in
constants.tokens_per_roll

10
src/proto_alpha/lib_protocol/src/parameters_repr.ml
View File

@ -110,9 +110,6 @@ let constants_encoding =
and proof_of_work_threshold =
opt Compare.Int64.(=)
default.proof_of_work_threshold c.proof_of_work_threshold
and dictator_pubkey =
opt Signature.Public_key.(=)
default.dictator_pubkey c.dictator_pubkey
and tokens_per_roll =
opt Tez_repr.(=)
default.tokens_per_roll c.tokens_per_roll
@ -154,7 +151,6 @@ let constants_encoding =
hard_gas_limit_per_operation,
hard_gas_limit_per_block),
((proof_of_work_threshold,
dictator_pubkey,
tokens_per_roll,
michelson_maximum_type_size,
seed_nonce_revelation_tip,
@ -175,7 +171,6 @@ let constants_encoding =
hard_gas_limit_per_operation,
hard_gas_limit_per_block),
((proof_of_work_threshold,
dictator_pubkey,
tokens_per_roll,
michelson_maximum_type_size,
seed_nonce_revelation_tip,
@ -209,8 +204,6 @@ let constants_encoding =
unopt default.hard_gas_limit_per_block hard_gas_limit_per_block ;
proof_of_work_threshold =
unopt default.proof_of_work_threshold proof_of_work_threshold ;
dictator_pubkey =
unopt default.dictator_pubkey dictator_pubkey ;
tokens_per_roll =
unopt default.tokens_per_roll tokens_per_roll ;
michelson_maximum_type_size =
@ -244,9 +237,8 @@ let constants_encoding =
(opt "hard_gas_limit_per_operation" z)
(opt "hard_gas_limit_per_block" z))
(merge_objs
(obj9
(obj8
(opt "proof_of_work_threshold" int64)
(opt "dictator_pubkey" Signature.Public_key.encoding)
(opt "tokens_per_roll" Tez_repr.encoding)
(opt "michelson_maximum_type_size" uint16)
(opt "seed_nonce_revelation_tip" Tez_repr.encoding)

2
src/proto_alpha/lib_protocol/test/helpers/block.ml
View File

@ -223,7 +223,6 @@ let genesis
?(hard_gas_limit_per_operation = Constants_repr.default.hard_gas_limit_per_operation)
?(hard_gas_limit_per_block = Constants_repr.default.hard_gas_limit_per_block)
?(proof_of_work_threshold = Int64.(neg one))
?(dictator_pubkey = Constants_repr.default.dictator_pubkey)
?(tokens_per_roll = Constants_repr.default.tokens_per_roll)
?(michelson_maximum_type_size = Constants_repr.default.michelson_maximum_type_size)
?(seed_nonce_revelation_tip = Constants_repr.default.seed_nonce_revelation_tip)
@ -267,7 +266,6 @@ let genesis
hard_gas_limit_per_operation ;
hard_gas_limit_per_block ;
proof_of_work_threshold ;
dictator_pubkey ;
tokens_per_roll ;
michelson_maximum_type_size ;
seed_nonce_revelation_tip ;

1
src/proto_alpha/lib_protocol/test/helpers/block.mli
View File

@ -84,7 +84,6 @@ val genesis:
?hard_gas_limit_per_operation:Z.t ->
?hard_gas_limit_per_block:Z.t ->
?proof_of_work_threshold:int64 ->
?dictator_pubkey:public_key ->
?tokens_per_roll:Tez_repr.tez ->
?michelson_maximum_type_size:int ->
?seed_nonce_revelation_tip:Tez_repr.tez ->