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.

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

Update to GHC 9.6.6 #112

Merged
merged 2 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ on:
workflow_dispatch: # allow manual trigger

env:
RUST: 1.73
GHC: 9.6.4
RUST: 1.82
GHC: 9.6.6

jobs:
fourmolu:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
REGISTRY: docker.io
IMAGE_NAME: wallet-proxy
# the build image
BASE_IMAGE_TAG: rust1.73-ghc9.6.4
BASE_IMAGE_TAG: rust-1.82_ghc-9.6.6-1

jobs:
build-and-push-image:
Expand Down
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased changes

- Update GHC version to 9.6.6 (lts-22.39).

## 0.32.1

- Endpoint `/v1/accBalance` displays correct `accountAtDisposal` when used with a node version < 7.
Expand Down
2 changes: 2 additions & 0 deletions src/Internationalization/En.hs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ translation = I18n{..}
DelegateToBaker bid -> "staking pool " <> Text.pack (show bid)
i18nEvent DelegationAdded{..} = "Added delegator " <> descrDelegator edaDelegatorId edaAccount
i18nEvent DelegationRemoved{..} = "Removed delegator " <> descrDelegator edrDelegatorId edrAccount
i18nEvent BakerSuspended{..} = "Validator " <> Text.pack (show ebsBakerId) <> " was suspended."
i18nEvent BakerResumed{..} = "Validator " <> Text.pack (show ebrBakerId) <> " was resumed."
i18nSpecialEvent BakingRewards{..} =
"Block rewards\n"
<> Text.unlines (map (\(addr, amnt) -> " - account " <> descrAccount addr <> " awarded " <> descrAmount amnt) . Map.toAscList . accountAmounts $ stoBakerRewards)
Expand Down
5 changes: 1 addition & 4 deletions src/Proxy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,7 @@ getRewardPeriodLength lfb = do
case cpksRes of
Left err -> return $ StatusOk $ GRPCResponse hds $ Left err
Right (EChainParametersAndKeys (ecpParams :: ChainParameters' cpv) _) -> do
let rpLength = case chainParametersVersion @cpv of
SChainParametersV0 -> Nothing
SChainParametersV1 -> Just $ ecpParams ^. cpTimeParameters . supportedOParam . tpRewardPeriodLength
SChainParametersV2 -> Just $ ecpParams ^. cpTimeParameters . supportedOParam . tpRewardPeriodLength
let rpLength = ecpParams ^? cpTimeParameters . traversed . tpRewardPeriodLength
return $ StatusOk $ GRPCResponse hds $ Right rpLength

-- |Version of the AccountBalance endpoint.
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-22.9
resolver: lts-22.39

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down
Loading