From 7de7cfb227d8912d8bbb8a3e1b80008b77386219 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 28 Nov 2023 15:33:38 +0100 Subject: [PATCH] Rename stake-address-info field: stakeDelegation -> delegation for eras prior to Conway --- .github/workflows/haskell.yml | 2 +- cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index e688a8fcdc..de9d18eb4e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -20,7 +20,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2023-11-20" + CABAL_CACHE_VERSION: "2023-11-28" concurrency: group: > diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index 7b9114c19b..9d85050cab 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs @@ -821,6 +821,7 @@ runQueryStakeAddressInfoCmd return $ do writeStakeAddressInfo + era mOutFile (DelegationsAndRewards (stakeRewardAccountBalances, stakePools)) (Map.mapKeys (makeStakeAddress networkId) stakeDelegDeposits) @@ -832,12 +833,14 @@ runQueryStakeAddressInfoCmd -- ------------------------------------------------------------------------------------------------- writeStakeAddressInfo - :: Maybe (File () Out) + :: CardanoEra era + -> Maybe (File () Out) -> DelegationsAndRewards -> Map StakeAddress Lovelace -- ^ deposits -> Map StakeAddress (L.DRep L.StandardCrypto) -- ^ vote delegatees -> ExceptT QueryCmdError IO () writeStakeAddressInfo + era mOutFile (DelegationsAndRewards (stakeAccountBalances, stakePools)) stakeDelegDeposits @@ -851,7 +854,7 @@ writeStakeAddressInfo (\(addr, mBalance, mPoolId, mDRep, mDeposit) -> Aeson.object [ "address" .= addr - , "stakeDelegation" .= mPoolId + , forEraInEon @ConwayEraOnwards era "delegation" (const "stakeDelegation") .= mPoolId , "voteDelegation" .= fmap friendlyDRep mDRep , "rewardAccountBalance" .= mBalance , "delegationDeposit" .= mDeposit