Merge pull request #487 from input-output-hk/mgalazyn/fix/rename-stak…

…e-address-output-field Rename stake-address-info field: stakeDelegation -> delegation for eras prior to Conway
IntersectMBO · Nov 28, 2023 · 1cc239c · 1cc239c
2 parents 3379069 + 7de7cfb
commit 1cc239c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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