From 9236d5a81899dc19b4d4be038d12a17d2ad4c886 Mon Sep 17 00:00:00 2001
From: Roman <roman@osmosis.team>
Date: Thu, 23 Jun 2022 14:43:51 -0400
Subject: [PATCH] fix: gov proto merge conflict (#270)

---
 docs/core/proto-docs.md            | 151 ++++++++++++++++-------------
 proto/cosmos/gov/v1beta1/gov.proto |  15 ---
 snapshots/types/snapshot.pb.go     |  10 +-
 3 files changed, 90 insertions(+), 86 deletions(-)

diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
index 2cc77554bdda..7dd0e24a6a17 100644
--- a/docs/core/proto-docs.md
+++ b/docs/core/proto-docs.md
@@ -164,6 +164,11 @@
 - [cosmos/base/snapshots/v1beta1/snapshot.proto](#cosmos/base/snapshots/v1beta1/snapshot.proto)
     - [Metadata](#cosmos.base.snapshots.v1beta1.Metadata)
     - [Snapshot](#cosmos.base.snapshots.v1beta1.Snapshot)
+    - [SnapshotExtensionMeta](#cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta)
+    - [SnapshotExtensionPayload](#cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload)
+    - [SnapshotIAVLItem](#cosmos.base.snapshots.v1beta1.SnapshotIAVLItem)
+    - [SnapshotItem](#cosmos.base.snapshots.v1beta1.SnapshotItem)
+    - [SnapshotStoreItem](#cosmos.base.snapshots.v1beta1.SnapshotStoreItem)
   
 - [cosmos/base/store/v1beta1/commit_info.proto](#cosmos/base/store/v1beta1/commit_info.proto)
     - [CommitID](#cosmos.base.store.v1beta1.CommitID)
@@ -173,11 +178,6 @@
 - [cosmos/base/store/v1beta1/listening.proto](#cosmos/base/store/v1beta1/listening.proto)
     - [StoreKVPair](#cosmos.base.store.v1beta1.StoreKVPair)
   
-- [cosmos/base/store/v1beta1/snapshot.proto](#cosmos/base/store/v1beta1/snapshot.proto)
-    - [SnapshotIAVLItem](#cosmos.base.store.v1beta1.SnapshotIAVLItem)
-    - [SnapshotItem](#cosmos.base.store.v1beta1.SnapshotItem)
-    - [SnapshotStoreItem](#cosmos.base.store.v1beta1.SnapshotStoreItem)
-  
 - [cosmos/base/tendermint/v1beta1/query.proto](#cosmos/base/tendermint/v1beta1/query.proto)
     - [GetBlockByHeightRequest](#cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest)
     - [GetBlockByHeightResponse](#cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse)
@@ -2720,68 +2720,83 @@ Snapshot contains Tendermint state sync snapshot info.
 
 
 
- <!-- end messages -->
 
- <!-- end enums -->
+<a name="cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta"></a>
 
- <!-- end HasExtensions -->
+### SnapshotExtensionMeta
+SnapshotExtensionMeta contains metadata about an external snapshotter.
 
- <!-- end services -->
 
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `name` | [string](#string) |  |  |
+| `format` | [uint32](#uint32) |  |  |
 
 
-<a name="cosmos/base/store/v1beta1/commit_info.proto"></a>
-<p align="right"><a href="#top">Top</a></p>
 
-## cosmos/base/store/v1beta1/commit_info.proto
 
 
 
-<a name="cosmos.base.store.v1beta1.CommitID"></a>
+<a name="cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload"></a>
 
-### CommitID
-CommitID defines the committment information when a specific store is
-committed.
+### SnapshotExtensionPayload
+SnapshotExtensionPayload contains payloads of an external snapshotter.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `version` | [int64](#int64) |  |  |
-| `hash` | [bytes](#bytes) |  |  |
+| `payload` | [bytes](#bytes) |  |  |
 
 
 
 
 
 
-<a name="cosmos.base.store.v1beta1.CommitInfo"></a>
+<a name="cosmos.base.snapshots.v1beta1.SnapshotIAVLItem"></a>
 
-### CommitInfo
-CommitInfo defines commit information used by the multi-store when committing
-a version/height.
+### SnapshotIAVLItem
+SnapshotIAVLItem is an exported IAVL node.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `version` | [int64](#int64) |  |  |
-| `store_infos` | [StoreInfo](#cosmos.base.store.v1beta1.StoreInfo) | repeated |  |
+| `key` | [bytes](#bytes) |  |  |
+| `value` | [bytes](#bytes) |  |  |
+| `version` | [int64](#int64) |  | version is block height |
+| `height` | [int32](#int32) |  | height is depth of the tree. |
 
 
 
 
 
 
-<a name="cosmos.base.store.v1beta1.StoreInfo"></a>
+<a name="cosmos.base.snapshots.v1beta1.SnapshotItem"></a>
 
-### StoreInfo
-StoreInfo defines store-specific commit information. It contains a reference
-between a store name and the commit ID.
+### SnapshotItem
+SnapshotItem is an item contained in a rootmulti.Store snapshot.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `store` | [SnapshotStoreItem](#cosmos.base.snapshots.v1beta1.SnapshotStoreItem) |  |  |
+| `iavl` | [SnapshotIAVLItem](#cosmos.base.snapshots.v1beta1.SnapshotIAVLItem) |  |  |
+| `extension` | [SnapshotExtensionMeta](#cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta) |  |  |
+| `extension_payload` | [SnapshotExtensionPayload](#cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload) |  |  |
+
+
+
+
+
+
+<a name="cosmos.base.snapshots.v1beta1.SnapshotStoreItem"></a>
+
+### SnapshotStoreItem
+SnapshotStoreItem contains metadata about a snapshotted store.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `name` | [string](#string) |  |  |
-| `commit_id` | [CommitID](#cosmos.base.store.v1beta1.CommitID) |  |  |
 
 
 
@@ -2797,94 +2812,96 @@ between a store name and the commit ID.
 
 
 
-<a name="cosmos/base/store/v1beta1/listening.proto"></a>
+<a name="cosmos/base/store/v1beta1/commit_info.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmos/base/store/v1beta1/listening.proto
-
+## cosmos/base/store/v1beta1/commit_info.proto
 
 
-<a name="cosmos.base.store.v1beta1.StoreKVPair"></a>
 
-### StoreKVPair
-StoreKVPair is a KVStore KVPair used for listening to state changes (Sets and Deletes)
-It optionally includes the StoreKey for the originating KVStore and a Boolean flag to distinguish between Sets and
-Deletes
+<a name="cosmos.base.store.v1beta1.CommitID"></a>
 
-Since: cosmos-sdk 0.43
+### CommitID
+CommitID defines the committment information when a specific store is
+committed.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `store_key` | [string](#string) |  | the store key for the KVStore this pair originates from |
-| `delete` | [bool](#bool) |  | true indicates a delete operation, false indicates a set operation |
-| `key` | [bytes](#bytes) |  |  |
-| `value` | [bytes](#bytes) |  |  |
+| `version` | [int64](#int64) |  |  |
+| `hash` | [bytes](#bytes) |  |  |
 
 
 
 
 
- <!-- end messages -->
 
- <!-- end enums -->
+<a name="cosmos.base.store.v1beta1.CommitInfo"></a>
 
- <!-- end HasExtensions -->
+### CommitInfo
+CommitInfo defines commit information used by the multi-store when committing
+a version/height.
 
- <!-- end services -->
 
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `version` | [int64](#int64) |  |  |
+| `store_infos` | [StoreInfo](#cosmos.base.store.v1beta1.StoreInfo) | repeated |  |
 
 
-<a name="cosmos/base/store/v1beta1/snapshot.proto"></a>
-<p align="right"><a href="#top">Top</a></p>
 
-## cosmos/base/store/v1beta1/snapshot.proto
 
 
 
-<a name="cosmos.base.store.v1beta1.SnapshotIAVLItem"></a>
+<a name="cosmos.base.store.v1beta1.StoreInfo"></a>
 
-### SnapshotIAVLItem
-SnapshotIAVLItem is an exported IAVL node.
+### StoreInfo
+StoreInfo defines store-specific commit information. It contains a reference
+between a store name and the commit ID.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `key` | [bytes](#bytes) |  |  |
-| `value` | [bytes](#bytes) |  |  |
-| `version` | [int64](#int64) |  |  |
-| `height` | [int32](#int32) |  |  |
+| `name` | [string](#string) |  |  |
+| `commit_id` | [CommitID](#cosmos.base.store.v1beta1.CommitID) |  |  |
 
 
 
 
 
+ <!-- end messages -->
 
-<a name="cosmos.base.store.v1beta1.SnapshotItem"></a>
+ <!-- end enums -->
 
-### SnapshotItem
-SnapshotItem is an item contained in a rootmulti.Store snapshot.
+ <!-- end HasExtensions -->
 
+ <!-- end services -->
 
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `store` | [SnapshotStoreItem](#cosmos.base.store.v1beta1.SnapshotStoreItem) |  |  |
-| `iavl` | [SnapshotIAVLItem](#cosmos.base.store.v1beta1.SnapshotIAVLItem) |  |  |
 
 
+<a name="cosmos/base/store/v1beta1/listening.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
 
+## cosmos/base/store/v1beta1/listening.proto
 
 
 
-<a name="cosmos.base.store.v1beta1.SnapshotStoreItem"></a>
+<a name="cosmos.base.store.v1beta1.StoreKVPair"></a>
 
-### SnapshotStoreItem
-SnapshotStoreItem contains metadata about a snapshotted store.
+### StoreKVPair
+StoreKVPair is a KVStore KVPair used for listening to state changes (Sets and Deletes)
+It optionally includes the StoreKey for the originating KVStore and a Boolean flag to distinguish between Sets and
+Deletes
+
+Since: cosmos-sdk 0.43
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `name` | [string](#string) |  |  |
+| `store_key` | [string](#string) |  | the store key for the KVStore this pair originates from |
+| `delete` | [bool](#bool) |  | true indicates a delete operation, false indicates a set operation |
+| `key` | [bytes](#bytes) |  |  |
+| `value` | [bytes](#bytes) |  |  |
 
 
 
diff --git a/proto/cosmos/gov/v1beta1/gov.proto b/proto/cosmos/gov/v1beta1/gov.proto
index fd3960aafe39..01aebf950cf3 100644
--- a/proto/cosmos/gov/v1beta1/gov.proto
+++ b/proto/cosmos/gov/v1beta1/gov.proto
@@ -198,18 +198,3 @@ message TallyParams {
     (gogoproto.moretags)   = "yaml:\"veto_threshold\""
   ];
 }
-<<<<<<< HEAD
-=======
-
-// ProposalVotingPeriod defines custom voting periods for a unique governance
-// proposal type.
-message ProposalVotingPeriod {
-  string                   proposal_type = 1; // e.g. "cosmos.params.v1beta1.ParameterChangeProposal"
-  google.protobuf.Duration voting_period = 2 [
-    (gogoproto.nullable)    = false,
-    (gogoproto.stdduration) = true,
-    (gogoproto.jsontag)     = "voting_period,omitempty",
-    (gogoproto.moretags)    = "yaml:\"voting_period\""
-  ];
-}
->>>>>>> 46bb6247d (fix: Add supply offsets to genesis (#253))
diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go
index 5a70e5eb8d4d..c7e427343346 100644
--- a/snapshots/types/snapshot.pb.go
+++ b/snapshots/types/snapshot.pb.go
@@ -306,10 +306,12 @@ func (m *SnapshotStoreItem) GetName() string {
 
 // SnapshotIAVLItem is an exported IAVL node.
 type SnapshotIAVLItem struct {
-	Key     []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	Value   []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	Version int64  `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
-	Height  int32  `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
+	Key   []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	// version is block height
+	Version int64 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
+	// height is depth of the tree.
+	Height int32 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
 }
 
 func (m *SnapshotIAVLItem) Reset()         { *m = SnapshotIAVLItem{} }