fix: EXPERIMENTAL_protocol_config applies overrides from EpochConfig #9692
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
People with M1 Macs run the neard node too, not just the test suites. Unfortunately a proper regression test for this is not obvious… I’ll think about it. (Possibly) Fixes #9665
wacban
previously approved these changes
Oct 17, 2023
| @@ -39,10 +39,9 @@ impl RuntimeConfig { | |||
|
|
|||
| pub fn test() -> Self { | |||
| let config_store = super::config_store::RuntimeConfigStore::new(None); | |||
| let mut wasm_config = near_vm_runner::logic::Config::clone( | |||
There was a problem hiding this comment.
Seem unrelated, merge artifact?
There was a problem hiding this comment.
Yes, resolved by rebasing.
| epoch_config.validator_selection_config.minimum_validators_per_shard; | ||
| genesis_config.minimum_stake_ratio = | ||
| epoch_config.validator_selection_config.minimum_stake_ratio; | ||
|
|
||
| let runtime_config = | ||
| self.runtime_config_store.get_config(protocol_version).as_ref().clone(); | ||
| Ok(ProtocolConfig { genesis_config, runtime_config }) |
There was a problem hiding this comment.
Can you just return the epoch config? It doesn't make much sense to copy all of the fields over from one struct to another.
There was a problem hiding this comment.
return the epoch config
That would probably be a better RPC design 🤔
I'd like to keep the scope of this PR to be a bug fix.
Added a TODO in the code to consider a backwards-incompatible change of ProtocolConfigView.
|
Thanks @wacban |
nikurt
added a commit
that referenced
this pull request
Oct 18, 2023
…9692) Testing this PR on a testnet node, the diff with results from an rpc node is the following. Both changes look good to me. ``` 10c10 < "chunk_producer_kickout_threshold": 90, --- > "chunk_producer_kickout_threshold": 80, 28c28 < "num_block_producer_seats": 200, --- > "num_block_producer_seats": 100, ``` Proofs: * https://github.com/near/nearcore/blob/a5238cc70e268fe6da218c8367b053d53711ac6f/core/primitives/src/epoch_manager.rs#L134 * https://github.com/near/nearcore/blob/6f324e84a7a7162956f0b9985094ee146919f5ae/core/primitives/src/epoch_manager.rs#L149 Fix #9553 Also adds new fields to the response: * shard_layout * num_chunk_only_producer_seats * minimum_validators_per_shard * minimum_stake_ratio * max_kickout_stake_perc --------- Co-authored-by: Simonas Kazlauskas <git@kazlauskas.me>
nikurt
added a commit
that referenced
this pull request
Oct 20, 2023
…9692) Testing this PR on a testnet node, the diff with results from an rpc node is the following. Both changes look good to me. ``` 10c10 < "chunk_producer_kickout_threshold": 90, --- > "chunk_producer_kickout_threshold": 80, 28c28 < "num_block_producer_seats": 200, --- > "num_block_producer_seats": 100, ``` Proofs: * https://github.com/near/nearcore/blob/a5238cc70e268fe6da218c8367b053d53711ac6f/core/primitives/src/epoch_manager.rs#L134 * https://github.com/near/nearcore/blob/6f324e84a7a7162956f0b9985094ee146919f5ae/core/primitives/src/epoch_manager.rs#L149 Fix #9553 Also adds new fields to the response: * shard_layout * num_chunk_only_producer_seats * minimum_validators_per_shard * minimum_stake_ratio * max_kickout_stake_perc --------- Co-authored-by: Simonas Kazlauskas <git@kazlauskas.me>
nikurt
added a commit
that referenced
this pull request
Oct 20, 2023
…9692) Testing this PR on a testnet node, the diff with results from an rpc node is the following. Both changes look good to me. ``` 10c10 < "chunk_producer_kickout_threshold": 90, --- > "chunk_producer_kickout_threshold": 80, 28c28 < "num_block_producer_seats": 200, --- > "num_block_producer_seats": 100, ``` Proofs: * https://github.com/near/nearcore/blob/a5238cc70e268fe6da218c8367b053d53711ac6f/core/primitives/src/epoch_manager.rs#L134 * https://github.com/near/nearcore/blob/6f324e84a7a7162956f0b9985094ee146919f5ae/core/primitives/src/epoch_manager.rs#L149 Fix #9553 Also adds new fields to the response: * shard_layout * num_chunk_only_producer_seats * minimum_validators_per_shard * minimum_stake_ratio * max_kickout_stake_perc --------- Co-authored-by: Simonas Kazlauskas <git@kazlauskas.me>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Testing this PR on a testnet node, the diff with results from an rpc node is the following. Both changes look good to me.
Proofs:
nearcore/core/primitives/src/epoch_manager.rs
Line 134 in a5238cc
nearcore/core/primitives/src/epoch_manager.rs
Line 149 in 6f324e8
Fix #9553
Also adds new fields to the response: