Merge pull request #1316 from Concordium/fix-payday-update

Fix timing of payday after P7->P8 protocol update.
Concordium · Jan 20, 2025 · 0917569 · 0917569
2 parents 514a569 + 351d0d5
commit 0917569
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git 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
diff --git 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
diff --git 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 <[email protected]>"]
 exclude = [".gitignore", ".gitlab-ci.yml", "test/**/*","**/**/.gitignore","**/**/.gitlab-ci.yml"]

diff --git 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
+1 −1		concordium-grpc-api
+2 −1		haskell-src/Concordium/Types/Transactions.hs
+1 −0		rust-src/concordium_base/CHANGELOG.md
+5 −1		rust-src/concordium_base/src/base.rs