...
 
Commits (5)
......@@ -56,6 +56,7 @@ check_linting:
script:
- src/tooling/lint.sh check.ci
- src/tooling/lint.sh check_scripts
- src/tooling/lint.sh check.ocamlformat
check_python_linting:
<<: *build_definition
......
......@@ -41,7 +41,8 @@ endif
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_baker/main_baker_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_endorser/main_endorser_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/bin_accuser/main_accuser_$(p).exe) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/sandbox-parameters.json)
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/sandbox-parameters.json) \
$(foreach p, $(active_protocol_directories), src/proto_$(p)/lib_parameters/test-parameters.json)
@cp _build/default/src/bin_node/main.exe tezos-node
@cp _build/default/src/bin_validation/main_validator.exe tezos-validator
@cp _build/default/src/bin_client/main_client.exe tezos-client
......@@ -53,7 +54,8 @@ endif
cp _build/default/src/proto_$$p/bin_baker/main_baker_$$p.exe tezos-baker-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/bin_endorser/main_endorser_$$p.exe tezos-endorser-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/bin_accuser/main_accuser_$$p.exe tezos-accuser-`echo $$p | tr -- _ -` ; \
cp _build/default/src/proto_$$p/lib_parameters/sandbox-parameters.json sandbox-parameters.json ; \
cp _build/default/src/proto_$$p/lib_parameters/sandbox-parameters.json src/proto_$$p/parameters/sandbox-parameters.json ; \
cp _build/default/src/proto_$$p/lib_parameters/test-parameters.json src/proto_$$p/parameters/test-parameters.json ; \
done
PROTOCOLS := $(wildcard src/proto_*)
......
......@@ -129,7 +129,7 @@ main () {
local_signer="${local_signer:-$bin_dir/../../_build/default/src/bin_signer/main_signer.exe}"
local_compiler="${local_compiler:-$bin_dir/../../_build/default/src/lib_protocol_compiler/main_native.exe}"
parameters_file="$bin_dir/../../sandbox-parameters.json"
parameters_file="$bin_dir/../proto_alpha/parameters/sandbox-parameters.json"
else
# we assume a clean install with tezos-(admin-)client in the path
......
......@@ -540,8 +540,9 @@ module Manpage = struct
`I
( "$(b,Run in sandbox mode listening to RPC commands at localhost \
port 8732)",
"$(mname) run --sandbox=sandbox-parameters.json --data-dir \
/custom/data/dir --rpc-addr localhost:8732" );
"$(mname) run \
--sandbox=src/proto_alpha/parameters/sandbox-parameters.json \
--data-dir /custom/data/dir --rpc-addr localhost:8732" );
`I ("$(b,Run a node that accepts network connections)", "$(mname) run")
]
......
wrap-fun-args=false
let-binding-spacing=compact
field-space=loose
break-separators=after-and-docked
sequence-style=separator
doc-comments=before
margin=80
module-item-spacing=sparse
parens-tuple=always
parens-tuple-patterns=always
break-string-literals=newlines-and-wrap
wrap-fun-args=false
let-binding-spacing=compact
field-space=loose
break-separators=after-and-docked
sequence-style=separator
doc-comments=before
margin=80
module-item-spacing=sparse
parens-tuple=always
parens-tuple-patterns=always
break-string-literals=newlines-and-wrap
wrap-fun-args=false
let-binding-spacing=compact
field-space=loose
break-separators=after-and-docked
sequence-style=separator
doc-comments=before
margin=80
module-item-spacing=sparse
parens-tuple=always
parens-tuple-patterns=always
break-string-literals=newlines-and-wrap
alpha_context.ml
alpha_context.mli
alpha_services.ml
alpha_services.mli
amendment.ml
amendment.mli
apply.ml
apply_results.ml
apply_results.mli
baking.ml
baking.mli
blinded_public_key_hash.ml
blinded_public_key_hash.mli
block_header_repr.ml
block_header_repr.mli
bootstrap_storage.ml
bootstrap_storage.mli
commitment_repr.ml
commitment_repr.mli
commitment_storage.ml
commitment_storage.mli
constants_repr.ml
constants_services.ml
constants_services.mli
constants_storage.ml
contract_hash.ml
contract_repr.ml
contract_repr.mli
contract_services.ml
contract_services.mli
contract_storage.ml
contract_storage.mli
cycle_repr.ml
cycle_repr.mli
delegate_services.ml
delegate_services.mli
delegate_storage.ml
delegate_storage.mli
fees_storage.ml
fees_storage.mli
fitness_repr.ml
fitness_storage.ml
gas_limit_repr.ml
gas_limit_repr.mli
helpers_services.ml
helpers_services.mli
init_storage.ml
legacy_script_support_repr.ml
legacy_script_support_repr.mli
level_repr.ml
level_repr.mli
level_storage.ml
level_storage.mli
main.ml
main.mli
manager_repr.ml
manager_repr.mli
michelson_v1_gas.ml
michelson_v1_gas.mli
michelson_v1_primitives.ml
michelson_v1_primitives.mli
misc.ml
misc.mli
nonce_hash.ml
nonce_storage.ml
nonce_storage.mli
operation_repr.ml
operation_repr.mli
parameters_repr.ml
parameters_repr.mli
period_repr.ml
period_repr.mli
qty_repr.ml
raw_context.ml
raw_context.mli
raw_level_repr.ml
raw_level_repr.mli
roll_repr.ml
roll_repr.mli
roll_storage.ml
roll_storage.mli
script_expr_hash.ml
script_interpreter.ml
script_interpreter.mli
script_int_repr.ml
script_int_repr.mli
script_ir_annot.ml
script_ir_annot.mli
script_ir_translator.ml
script_ir_translator.mli
script_repr.ml
script_repr.mli
script_tc_errors.ml
script_tc_errors_registration.ml
script_timestamp_repr.ml
script_timestamp_repr.mli
script_typed_ir.ml
seed_repr.ml
seed_repr.mli
seed_storage.ml
seed_storage.mli
services_registration.ml
state_hash.ml
storage_description.ml
storage_description.mli
storage_functors.ml
storage_functors.mli
storage.ml
storage.mli
storage_sigs.ml
tez_repr.ml
tez_repr.mli
time_repr.ml
time_repr.mli
vote_repr.ml
vote_repr.mli
vote_storage.ml
vote_storage.mli
voting_period_repr.ml
voting_period_repr.mli
voting_services.ml
voting_services.mli
apply.ml
apply.mli
error.ml
error.mli
header.ml
header.mli
main.ml
main.mli
proto_operation.ml
proto_operation.mli
proto_params.ml
proto_params.mli
receipt.ml
receipt.mli
services.ml
services.mli
state.ml
state.mli
......@@ -8,6 +8,7 @@ Where <action> can be:
* update.ocamlformat: update all the \`.ocamlformat\` files and
git-commit (requires clean repo).
* check.ocamlformat: check the above does nothing.
* check.dune: check formatting while assuming running under Dune's
rule (\`dune build @runtest_lint\`).
* check.ci: check formatting using git (for GitLabCI's verbose run).
......@@ -61,7 +62,7 @@ EOF
source_directories="src docs/doc_gen"
update_all_dot_ocamlformats () {
interesting_directories=$(find $source_directories \( -name "*.ml" -o -name "*.mli" \) -type f | sed 's:/[^/]*$::' | sort -u)
interesting_directories=$(find $source_directories \( -name "*.ml" -o -name "*.mli" \) -type f | sed 's:/[^/]*$::' | LC_COLLATE=C sort -u)
if git diff --name-only HEAD --exit-code
then
say "Repository clean :thumbsup:"
......@@ -89,7 +90,6 @@ update_all_dot_ocamlformats () {
esac
git add "$ofmt"
done
git commit -m 'Update .ocamlformat files'
}
check_with_dune () {
......@@ -138,7 +138,11 @@ fi
case "$action" in
"update.ocamlformat" )
update_all_dot_ocamlformats ;;
update_all_dot_ocamlformats
git commit -m 'Update .ocamlformat files' ;;
"check.ocamlformat" )
update_all_dot_ocamlformats
git diff --name-only HEAD --exit-code ;;
"check.dune" )
check_with_dune $files ;;
"check.ci" )
......
BOOTSTRAP_ACCOUNTS = [
["edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav",
"4000000000000"],
["edpktzNbDAUjUk697W7gYg2CRuBQjyPxbEg8dLccYYwKSKvkPvjtV9",
"4000000000000"],
["edpkuTXkJDGcFd5nh6VvMz8phXxU3Bi7h6hqgywNFi1vZTfQNnS1RV",
"4000000000000"],
["edpkuFrRoDSEbJYgxRtLx2ps82UdaYc1WwfS9sE11yhauZt5DgCHbU",
"4000000000000"],
["edpkv8EUUH68jmo3f7Um5PezmfGrRF24gnfLpH3sVNwJnV5bVCxL2n",
"4000000000000"]
]
COMMITMENTS = [
["btz1bRL4X5BWo2Fj4EsBdUwexXqgTf75uf1qa", "23932454669343"],
["btz1SxjV1syBgftgKy721czKi3arVkVwYUFSv", "72954577464032"],
["btz1LtoNCjiW23txBTenALaf5H6NKF1L3c1gw", "217487035428348"],
["btz1SUd3mMhEBcWudrn8u361MVAec4WYCcFoy", "4092742372031"],
["btz1MvBXf4orko1tsGmzkjLbpYSgnwUjEe81r", "17590039016550"],
["btz1LoDZ3zsjgG3k3cqTpUMc9bsXbchu9qMXT", "26322312350555"],
["btz1RMfq456hFV5AeDiZcQuZhoMv2dMpb9hpP", "244951387881443"],
["btz1Y9roTh4A7PsMBkp8AgdVFrqUDNaBE59y1", "80065050465525"],
["btz1Q1N2ePwhVw5ED3aaRVek6EBzYs1GDkSVD", "3569618927693"],
["btz1VFFVsVMYHd5WfaDTAt92BeQYGK8Ri4eLy", "9034781424478"]
]
PARAMETERS = {
"bootstrap_accounts": BOOTSTRAP_ACCOUNTS,
"commitments": COMMITMENTS,
"preserved_cycles": 2,
"blocks_per_cycle": 8,
"blocks_per_commitment": 4,
"blocks_per_roll_snapshot": 4,
"blocks_per_voting_period": 64,
"time_between_blocks": ["1", "0"],
"endorsers_per_block": 32,
"hard_gas_limit_per_operation": "800000",
"hard_gas_limit_per_block": "8000000",
"proof_of_work_threshold": "-1",
"tokens_per_roll": "8000000000",
"michelson_maximum_type_size": 1000,
"seed_nonce_revelation_tip": "125000",
"origination_size": 257,
"block_security_deposit": "512000000",
"endorsement_security_deposit": "64000000",
"block_reward": "16000000",
"endorsement_reward": "2000000",
"cost_per_byte": "1000",
"hard_storage_limit_per_operation": "60000",
"test_chain_duration": "1966080",
"quorum_min": 3000,
"quorum_max": 7000,
"min_proposal_quorum": 500,
"initial_endorsers": 1,
"delay_per_missing_endorsement": "1"
}
import os.path
import json
from tools import paths
PARAMETERS_FILE = (f'{paths.TEZOS_HOME}src/proto_alpha/parameters/'
'test-parameters.json')
assert os.path.isfile(PARAMETERS_FILE), (f'{PARAMETERS_FILE}'
' cannot be found; please first run'
' `make` in TEZOS_HOME.')
with open(PARAMETERS_FILE) as f:
PARAMETERS = json.load(f)
GENESIS_SK = "edsk31vznjHSSpGExDMHYASz45VZqXN4DPxvsa4hAyY8dHM28cZzp6"
GENESIS_PK = "edpkuSLWfVU1Vq7Jg9FucPyKmma6otcMHac9zG4oU1KMHSTBpJuGQ2"
IDENTITIES = {
'bootstrap1': {
'identity': "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx",
......