Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Take CapMaxGasPrice feature on nightly #4348

Merged
merged 7 commits into from
Jun 7, 2021
Merged

Take CapMaxGasPrice feature on nightly #4348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62ab870
upd version
Jun 3, 2021
04add90
set missing feature dependencies
Jun 4, 2021
0f9fcb4
Revert "upd version"
Jun 7, 2021
5caa4fc
Revert "set missing feature dependencies"
Jun 7, 2021
45db576
upd version
Jun 7, 2021
3d88e1b
fix restore_receipts test
Jun 7, 2021
686a647
Merge branch 'master' into upd-version
Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions chain/client/tests/process_blocks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,15 @@ mod protocol_feature_restore_receipts_after_fix_tests {
env.clients[0].chain.get_block_by_height(height - 1).unwrap().clone();
set_no_chunk_in_block(&mut block, &prev_block);
}
let validator_signer = InMemoryValidatorSigner::from_seed(
&"test0".to_string(),
KeyType::ED25519,
&"test0".to_string(),
);
block.mut_header().get_mut().inner_rest.latest_protocol_version =
ProtocolFeature::RestoreReceiptsAfterFix.protocol_version();
block.mut_header().resign(&validator_signer);

env.process_block(0, block, Provenance::PRODUCED);

let last_block = env.clients[0].chain.get_block_by_height(height).unwrap().clone();
Expand Down
2 changes: 1 addition & 1 deletion core/primitives/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ pub const PROTOCOL_VERSION: ProtocolVersion = 45;

/// Current latest nightly version of the protocol.
#[cfg(feature = "nightly_protocol")]
pub const PROTOCOL_VERSION: ProtocolVersion = 112;
pub const PROTOCOL_VERSION: ProtocolVersion = 113;

impl ProtocolFeature {
pub const fn protocol_version(self) -> ProtocolVersion {
Expand Down