From ca515b2e6061a92f1afd82e532d78d79004aee0b Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Thu, 17 Oct 2024 14:41:00 +0200 Subject: [PATCH 1/3] Support for consensus detailed status GRPC query. --- concordium-grpc-api | 2 +- haskell-src/Concordium/GRPC2.hs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/concordium-grpc-api b/concordium-grpc-api index 88183a8f5..9fac4729f 160000 --- a/concordium-grpc-api +++ b/concordium-grpc-api @@ -1 +1 @@ -Subproject commit 88183a8f5e0a3208f4da65d46e0c56d7ec5f14f7 +Subproject commit 9fac4729f29e2967a04658f1bacc7f735b9ddee5 diff --git a/haskell-src/Concordium/GRPC2.hs b/haskell-src/Concordium/GRPC2.hs index 98bb178d1..6fe819dd2 100644 --- a/haskell-src/Concordium/GRPC2.hs +++ b/haskell-src/Concordium/GRPC2.hs @@ -12,6 +12,13 @@ module Concordium.GRPC2 ( BakerKeysEvent, BlockHashInput (..), BlockHeightInput (..), + + -- * Helpers + mkSerialize, + mkWord64, + mkWord32, + mkWord16, + mkWord8, ) where @@ -47,6 +54,7 @@ import qualified Concordium.Types.Transactions as TxTypes import Concordium.Common.Time import Concordium.Common.Version +import qualified Concordium.Crypto.BlockSignature as BlockSignature import Concordium.Crypto.SHA256 (Hash) import Concordium.Crypto.SignatureScheme (Signature (..), VerifyKey (..)) import qualified Concordium.ID.AnonymityRevoker as ArInfo @@ -2393,3 +2401,7 @@ instance ToProto (DryRunResponse (TransactionSummary' ValidResultWithReturn)) wh -- Since only account transactions can be executed in a dry run, we should not have -- other transaction summary types. Left CEInvalidTransactionResult + +instance ToProto BlockSignature.Signature where + type Output BlockSignature.Signature = Proto.BlockSignature + toProto = mkSerialize From af5d8e93783541158e90cbd7fd6c496363f19415 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Mon, 21 Oct 2024 17:24:17 +0200 Subject: [PATCH 2/3] Update grpc --- concordium-grpc-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordium-grpc-api b/concordium-grpc-api index 9fac4729f..e59ea9056 160000 --- a/concordium-grpc-api +++ b/concordium-grpc-api @@ -1 +1 @@ -Subproject commit 9fac4729f29e2967a04658f1bacc7f735b9ddee5 +Subproject commit e59ea9056e7a92c7f1e765872193aea0ee6c36c0 From 7b4cc5a4331acb4ca254739336122cd82a91e247 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Thu, 31 Oct 2024 16:30:58 +0100 Subject: [PATCH 3/3] Update grpc after merge --- concordium-grpc-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordium-grpc-api b/concordium-grpc-api index 612dd5c70..8a0913cbd 160000 --- a/concordium-grpc-api +++ b/concordium-grpc-api @@ -1 +1 @@ -Subproject commit 612dd5c70ef56e685848616e55355b378a48427c +Subproject commit 8a0913cbd4aee73ce5157bbe17b3a5199964b5ca