From 533cd25e1c51078302c7e316ae3f95cf4fa937ed Mon Sep 17 00:00:00 2001 From: Eugene Kabanov Date: Fri, 18 Jun 2021 15:43:54 +0300 Subject: [PATCH] Add CONFIG_NAME parameter to REST API /eth/v1/config/spec response. (#2652) * Add CONFIG_NAME parameter to /eth/v1/config/spec response. * Add missed comma. * Use `const_preset` instead of CONFIG_NAME. --- beacon_chain/rpc/config_rest_api.nim | 2 ++ ncli/resttest-rules.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/beacon_chain/rpc/config_rest_api.nim b/beacon_chain/rpc/config_rest_api.nim index 359fe619d..d4dc49031 100644 --- a/beacon_chain/rpc/config_rest_api.nim +++ b/beacon_chain/rpc/config_rest_api.nim @@ -35,6 +35,8 @@ proc installConfigApiHandlers*(router: var RestRouter, node: BeaconNode) = "/api/eth/v1/config/spec") do () -> RestApiResponse: return RestApiResponse.jsonResponse( ( + CONFIG_NAME: + const_preset, MAX_COMMITTEES_PER_SLOT: Base10.toString(MAX_COMMITTEES_PER_SLOT), TARGET_COMMITTEE_SIZE: diff --git a/ncli/resttest-rules.json b/ncli/resttest-rules.json index d88bf6a0e..fb7d3506f 100644 --- a/ncli/resttest-rules.json +++ b/ncli/resttest-rules.json @@ -2471,7 +2471,7 @@ "response": { "status": {"operator": "equals", "value": "200"}, "headers": [{"key": "Content-Type", "value": "application/json", "operator": "equals"}], - "body": [{"operator": "jstructcmps", "start": ["data"], "value": {"MAX_COMMITTEES_PER_SLOT": "", "TARGET_COMMITTEE_SIZE": "", "MAX_VALIDATORS_PER_COMMITTEE": "", "MIN_PER_EPOCH_CHURN_LIMIT": "", "CHURN_LIMIT_QUOTIENT": "", "SHUFFLE_ROUND_COUNT": "", "MIN_GENESIS_ACTIVE_VALIDATOR_COUNT": "", "MIN_GENESIS_TIME": "", "HYSTERESIS_QUOTIENT": "", "HYSTERESIS_DOWNWARD_MULTIPLIER": "", "HYSTERESIS_UPWARD_MULTIPLIER": "", "SAFE_SLOTS_TO_UPDATE_JUSTIFIED": "", "ETH1_FOLLOW_DISTANCE": "", "TARGET_AGGREGATORS_PER_COMMITTEE": "", "RANDOM_SUBNETS_PER_VALIDATOR": "", "EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION": "", "SECONDS_PER_ETH1_BLOCK": "", "DEPOSIT_CHAIN_ID": "", "DEPOSIT_NETWORK_ID": "", "DEPOSIT_CONTRACT_ADDRESS": "", "MIN_DEPOSIT_AMOUNT": "", "MAX_EFFECTIVE_BALANCE": "", "EJECTION_BALANCE": "", "EFFECTIVE_BALANCE_INCREMENT": "", "GENESIS_FORK_VERSION": "", "BLS_WITHDRAWAL_PREFIX": "", "GENESIS_DELAY": "", "SECONDS_PER_SLOT": "", "MIN_ATTESTATION_INCLUSION_DELAY": "", "SLOTS_PER_EPOCH": "", "MIN_SEED_LOOKAHEAD": "", "MAX_SEED_LOOKAHEAD": "", "EPOCHS_PER_ETH1_VOTING_PERIOD": "", "SLOTS_PER_HISTORICAL_ROOT": "", "MIN_VALIDATOR_WITHDRAWABILITY_DELAY": "", "SHARD_COMMITTEE_PERIOD": "", "MIN_EPOCHS_TO_INACTIVITY_PENALTY": "", "EPOCHS_PER_HISTORICAL_VECTOR": "", "EPOCHS_PER_SLASHINGS_VECTOR": "", "HISTORICAL_ROOTS_LIMIT": "", "VALIDATOR_REGISTRY_LIMIT": "", "BASE_REWARD_FACTOR": "", "WHISTLEBLOWER_REWARD_QUOTIENT": "", "PROPOSER_REWARD_QUOTIENT": "", "INACTIVITY_PENALTY_QUOTIENT": "", "MIN_SLASHING_PENALTY_QUOTIENT" :"", "PROPORTIONAL_SLASHING_MULTIPLIER" :"", "MAX_PROPOSER_SLASHINGS" :"", "MAX_ATTESTER_SLASHINGS" :"", "MAX_ATTESTATIONS" :"", "MAX_DEPOSITS" :"", "MAX_VOLUNTARY_EXITS" :"", "DOMAIN_BEACON_PROPOSER" :"", "DOMAIN_BEACON_ATTESTER" :"", "DOMAIN_RANDAO" :"", "DOMAIN_DEPOSIT" :"", "DOMAIN_VOLUNTARY_EXIT" :"", "DOMAIN_SELECTION_PROOF" :"", "DOMAIN_AGGREGATE_AND_PROOF" :""}}] + "body": [{"operator": "jstructcmps", "start": ["data"], "value": {"CONFIG_NAME": "", "MAX_COMMITTEES_PER_SLOT": "", "TARGET_COMMITTEE_SIZE": "", "MAX_VALIDATORS_PER_COMMITTEE": "", "MIN_PER_EPOCH_CHURN_LIMIT": "", "CHURN_LIMIT_QUOTIENT": "", "SHUFFLE_ROUND_COUNT": "", "MIN_GENESIS_ACTIVE_VALIDATOR_COUNT": "", "MIN_GENESIS_TIME": "", "HYSTERESIS_QUOTIENT": "", "HYSTERESIS_DOWNWARD_MULTIPLIER": "", "HYSTERESIS_UPWARD_MULTIPLIER": "", "SAFE_SLOTS_TO_UPDATE_JUSTIFIED": "", "ETH1_FOLLOW_DISTANCE": "", "TARGET_AGGREGATORS_PER_COMMITTEE": "", "RANDOM_SUBNETS_PER_VALIDATOR": "", "EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION": "", "SECONDS_PER_ETH1_BLOCK": "", "DEPOSIT_CHAIN_ID": "", "DEPOSIT_NETWORK_ID": "", "DEPOSIT_CONTRACT_ADDRESS": "", "MIN_DEPOSIT_AMOUNT": "", "MAX_EFFECTIVE_BALANCE": "", "EJECTION_BALANCE": "", "EFFECTIVE_BALANCE_INCREMENT": "", "GENESIS_FORK_VERSION": "", "BLS_WITHDRAWAL_PREFIX": "", "GENESIS_DELAY": "", "SECONDS_PER_SLOT": "", "MIN_ATTESTATION_INCLUSION_DELAY": "", "SLOTS_PER_EPOCH": "", "MIN_SEED_LOOKAHEAD": "", "MAX_SEED_LOOKAHEAD": "", "EPOCHS_PER_ETH1_VOTING_PERIOD": "", "SLOTS_PER_HISTORICAL_ROOT": "", "MIN_VALIDATOR_WITHDRAWABILITY_DELAY": "", "SHARD_COMMITTEE_PERIOD": "", "MIN_EPOCHS_TO_INACTIVITY_PENALTY": "", "EPOCHS_PER_HISTORICAL_VECTOR": "", "EPOCHS_PER_SLASHINGS_VECTOR": "", "HISTORICAL_ROOTS_LIMIT": "", "VALIDATOR_REGISTRY_LIMIT": "", "BASE_REWARD_FACTOR": "", "WHISTLEBLOWER_REWARD_QUOTIENT": "", "PROPOSER_REWARD_QUOTIENT": "", "INACTIVITY_PENALTY_QUOTIENT": "", "MIN_SLASHING_PENALTY_QUOTIENT" :"", "PROPORTIONAL_SLASHING_MULTIPLIER" :"", "MAX_PROPOSER_SLASHINGS" :"", "MAX_ATTESTER_SLASHINGS" :"", "MAX_ATTESTATIONS" :"", "MAX_DEPOSITS" :"", "MAX_VOLUNTARY_EXITS" :"", "DOMAIN_BEACON_PROPOSER" :"", "DOMAIN_BEACON_ATTESTER" :"", "DOMAIN_RANDAO" :"", "DOMAIN_DEPOSIT" :"", "DOMAIN_VOLUNTARY_EXIT" :"", "DOMAIN_SELECTION_PROOF" :"", "DOMAIN_AGGREGATE_AND_PROOF" :""}}] } }, {