From 01b8dca9693d90bd6b347ac1202887170035c52e Mon Sep 17 00:00:00 2001 From: Emil Lai Date: Fri, 11 Aug 2023 09:51:07 +0200 Subject: [PATCH 1/2] Add a 'CommissionRates' field to 'CurrentPaydayBakerPoolStatus'. --- concordium-grpc-api | 2 +- haskell-src/Concordium/GRPC2.hs | 1 + haskell-src/Concordium/Types/Queries.hs | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/concordium-grpc-api b/concordium-grpc-api index bc0b3fcb1..32b4ab8aa 160000 --- a/concordium-grpc-api +++ b/concordium-grpc-api @@ -1 +1 @@ -Subproject commit bc0b3fcb12cbfb6336051a0bf40ae36474587790 +Subproject commit 32b4ab8aa292503d32117ec6b2d8986ed5c7fa8b diff --git a/haskell-src/Concordium/GRPC2.hs b/haskell-src/Concordium/GRPC2.hs index 377bf6aaa..e801004d5 100644 --- a/haskell-src/Concordium/GRPC2.hs +++ b/haskell-src/Concordium/GRPC2.hs @@ -1669,6 +1669,7 @@ instance ToProto QueryTypes.CurrentPaydayBakerPoolStatus where ProtoFields.lotteryPower .= bpsLotteryPower ProtoFields.bakerEquityCapital .= toProto bpsBakerEquityCapital ProtoFields.delegatedCapital .= toProto bpsDelegatedCapital + ProtoFields.commissionRates .= toProto bpsCommissionRates instance ToProto QueryTypes.RewardStatus where type Output QueryTypes.RewardStatus = Proto.TokenomicsInfo diff --git a/haskell-src/Concordium/Types/Queries.hs b/haskell-src/Concordium/Types/Queries.hs index 41b6a22b3..85bb38663 100644 --- a/haskell-src/Concordium/Types/Queries.hs +++ b/haskell-src/Concordium/Types/Queries.hs @@ -539,7 +539,9 @@ data CurrentPaydayBakerPoolStatus = CurrentPaydayBakerPoolStatus -- |The effective equity capital of the baker for the current reward period. bpsBakerEquityCapital :: !Amount, -- |The effective delegated capital to the pool for the current reward period. - bpsDelegatedCapital :: !Amount + bpsDelegatedCapital :: !Amount, + -- |The commission rates that apply for the current reward period. + bpsCommissionRates :: !CommissionRates } deriving (Eq, Show) From 2a45df5d6a00742eaaa1e81db6c763f66c531584 Mon Sep 17 00:00:00 2001 From: Emil Lai Date: Mon, 14 Aug 2023 10:39:44 +0200 Subject: [PATCH 2/2] Update grpc-api pointer. --- concordium-grpc-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordium-grpc-api b/concordium-grpc-api index 32b4ab8aa..13355aab2 160000 --- a/concordium-grpc-api +++ b/concordium-grpc-api @@ -1 +1 @@ -Subproject commit 32b4ab8aa292503d32117ec6b2d8986ed5c7fa8b +Subproject commit 13355aab208185c4d2f0d3f8cf7bd41d72a0da1a