From 351d0d52e933ba3b6280e0e60e81599534fcae1e Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Fri, 17 Jan 2025 16:21:57 +0100 Subject: [PATCH] Fix timing of payday after P7->P8 protocol update. --- CHANGELOG.md | 4 ++++ concordium-base | 2 +- .../src/Concordium/GlobalState/Persistent/BlockState.hs | 4 ++-- concordium-node/Cargo.lock | 2 +- concordium-node/Cargo.toml | 2 +- docs/grpc2.md | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e92c530c..075ed33fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased changes +## 8.0.2 + +- Fix a bug where the P7->P8 protocol update affects payday timing. + ## 8.0.1 - Fix a bug in computing the number of missed rounds in the event of a timeout. diff --git a/concordium-base b/concordium-base index 85c8d204e..6f6d1088c 160000 --- a/concordium-base +++ b/concordium-base @@ -1 +1 @@ -Subproject commit 85c8d204e63842c478ce81d77a69f9f09f561cb5 +Subproject commit 6f6d1088cd8660abe7d9e4a1274a817032313a57 diff --git a/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs b/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs index 120687c0a..b239037fa 100644 --- a/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs +++ b/concordium-consensus/src/Concordium/GlobalState/Persistent/BlockState.hs @@ -628,10 +628,10 @@ migrateBlockRewardDetails StateMigrationParametersP6ToP7{} _ _ (SomeParam TimePa (BlockRewardDetailsV1 hbr) -> BlockRewardDetailsV1 <$> migrateHashedBufferedRef (migratePoolRewardsP6 oldEpoch _tpRewardPeriodLength) hbr -migrateBlockRewardDetails StateMigrationParametersP7ToP8{} _ _ (SomeParam TimeParametersV1{..}) _ = \case +migrateBlockRewardDetails StateMigrationParametersP7ToP8{} _ _ (SomeParam TimeParametersV1{..}) oldEpoch = \case (BlockRewardDetailsV1 hbr) -> BlockRewardDetailsV1 - <$> migrateHashedBufferedRef (migratePoolRewards (rewardPeriodEpochs _tpRewardPeriodLength)) hbr + <$> migrateHashedBufferedRef (migratePoolRewardsP6 oldEpoch _tpRewardPeriodLength) hbr instance (MonadBlobStore m, IsBlockHashVersion bhv, IsAccountVersion av) => diff --git a/concordium-node/Cargo.lock b/concordium-node/Cargo.lock index 5a44caaed..f6dfc6338 100644 --- a/concordium-node/Cargo.lock +++ b/concordium-node/Cargo.lock @@ -796,7 +796,7 @@ dependencies = [ [[package]] name = "concordium_node" -version = "8.0.1" +version = "8.0.2" dependencies = [ "anyhow", "app_dirs2", diff --git a/concordium-node/Cargo.toml b/concordium-node/Cargo.toml index e6fadae14..f8e1645a3 100644 --- a/concordium-node/Cargo.toml +++ b/concordium-node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium_node" -version = "8.0.1" # must be kept in sync with 'is_compatible_version' in 'src/configuration.rs' +version = "8.0.2" # must be kept in sync with 'is_compatible_version' in 'src/configuration.rs' description = "Concordium Node" authors = ["Concordium "] exclude = [".gitignore", ".gitlab-ci.yml", "test/**/*","**/**/.gitignore","**/**/.gitlab-ci.yml"] diff --git a/docs/grpc2.md b/docs/grpc2.md index 180a37cd1..a5f99a167 100644 --- a/docs/grpc2.md +++ b/docs/grpc2.md @@ -64,6 +64,7 @@ If these are enabled then the following options become available instance_state_lookup = true get_next_account_sequence_number = true get_consensus_info = true + get_consensus_detailed_status = true get_ancestors = true get_block_item_status = true invoke_instance = true