From fa2ccc80da9b06b66d8e08322c0a739a2da76d0a Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Thu, 23 Sep 2021 10:26:25 +0000
Subject: [PATCH] proto: add tendermint go changes (#349)

* add missed proto files

* add abci changes

* rename blockchain to blocksync

* Update proto/tendermint/abci/types.proto

Co-authored-by: Callum Waters <cmwaters19@gmail.com>

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
---
 proto/tendermint/abci/types.proto                      | 4 ++++
 proto/tendermint/{blockchain => blocksync}/types.proto | 4 ++--
 proto/tendermint/statesync/types.proto                 | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename proto/tendermint/{blockchain => blocksync}/types.proto (94%)

diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto
index bf088e8b1..b396dcc55 100644
--- a/proto/tendermint/abci/types.proto
+++ b/proto/tendermint/abci/types.proto
@@ -196,6 +196,10 @@ message ResponseCheckTx {
   string         codespace  = 8;
   string         sender     = 9;
   int64          priority   = 10;
+
+  // mempool_error is set by Tendermint.
+  // ABCI applications creating a ResponseCheckTX should not set mempool_error.
+  string mempool_error = 11;
 }
 
 message ResponseDeliverTx {
diff --git a/proto/tendermint/blockchain/types.proto b/proto/tendermint/blocksync/types.proto
similarity index 94%
rename from proto/tendermint/blockchain/types.proto
rename to proto/tendermint/blocksync/types.proto
index f5c143cf5..8c187c793 100644
--- a/proto/tendermint/blockchain/types.proto
+++ b/proto/tendermint/blocksync/types.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
-package tendermint.blockchain;
+package tendermint.blocksync;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/blockchain";
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/blocksync";
 
 import "tendermint/types/block.proto";
 
diff --git a/proto/tendermint/statesync/types.proto b/proto/tendermint/statesync/types.proto
index 9247a78fd..ac21b5d7b 100644
--- a/proto/tendermint/statesync/types.proto
+++ b/proto/tendermint/statesync/types.proto
@@ -1,7 +1,9 @@
 syntax = "proto3";
 package tendermint.statesync;
 
+import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
+import "tendermint/types/params.proto";
 
 option go_package = "github.com/tendermint/tendermint/proto/tendermint/statesync";
 
@@ -55,6 +57,6 @@ message ParamsRequest {
 }
 
 message ParamsResponse {
-  uint64 height = 1;
-  tendermint.types.ConsensusParams consensus_params = 2;
+  uint64                           height           = 1;
+  tendermint.types.ConsensusParams consensus_params = 2 [(gogoproto.nullable) = false];
 }