From bbcde9ed8d112ba7a6aeb4eb7a826051d505cde4 Mon Sep 17 00:00:00 2001
From: Benjamin DENEUX <b.deneux@okp4.com>
Date: Mon, 16 Jan 2023 11:23:19 +0100
Subject: [PATCH] feat(buf): use buf deps instead of third party

---
 buf.gen.proto.yaml |  8 ++------
 buf.work.yaml      |  1 -
 go.mod             |  3 ++-
 go.sum             |  2 ++
 proto/buf.lock     | 17 +++++++++++++++++
 proto/buf.yaml     |  5 +++++
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/buf.gen.proto.yaml b/buf.gen.proto.yaml
index bf10ce2d..6d38adbb 100644
--- a/buf.gen.proto.yaml
+++ b/buf.gen.proto.yaml
@@ -1,12 +1,8 @@
 version: v1
-
 plugins:
   - name: gocosmos
     out: .
-    opt:
-      - plugins=interfacetype+grpc
-
+    opt: plugins=grpc
   - name: grpc-gateway
     out: .
-    opt:
-      - logtostderr=true
+    opt: logtostderr=true,allow_colon_final_segments=true
diff --git a/buf.work.yaml b/buf.work.yaml
index 494296bf..1878b341 100644
--- a/buf.work.yaml
+++ b/buf.work.yaml
@@ -1,4 +1,3 @@
 version: v1
 directories:
   - proto
-  - third_party/proto
diff --git a/go.mod b/go.mod
index 2d8accdc..8164442a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/CosmWasm/wasmd v0.28.0
 	github.com/armon/go-metrics v0.4.1
 	github.com/cosmos/cosmos-sdk v0.46.7
+	github.com/cosmos/gogoproto v1.4.3
 	github.com/cosmos/ibc-go/v5 v5.1.0
 	github.com/cosmos/interchain-accounts v0.3.5
 	github.com/gogo/protobuf v1.3.3
@@ -16,6 +17,7 @@ require (
 	github.com/ichiban/prolog v0.15.1
 	github.com/ignite/cli v0.25.2
 	github.com/prometheus/client_golang v1.13.0
+	github.com/smartystreets/goconvey v1.7.2
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.6.0
 	github.com/spf13/pflag v1.0.5
@@ -175,7 +177,6 @@ require (
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/smartystreets/assertions v1.2.0 // indirect
-	github.com/smartystreets/goconvey v1.7.2 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/viper v1.13.0 // indirect
diff --git a/go.sum b/go.sum
index bdb1ef4b..62ecd818 100644
--- a/go.sum
+++ b/go.sum
@@ -418,6 +418,8 @@ github.com/cosmos/cosmos-sdk v0.46.7/go.mod h1:fqKqz39U5IlEFb4nbQ72951myztsDzFKK
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
+github.com/cosmos/gogoproto v1.4.3 h1:RP3yyVREh9snv/lsOvmsAPQt8f44LgL281X0IOIhhcI=
+github.com/cosmos/gogoproto v1.4.3/go.mod h1:0hLIG5TR7IvV1fme1HCFKjfzW9X2x0Mo+RooWXCnOWU=
 github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
 github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
diff --git a/proto/buf.lock b/proto/buf.lock
index c91b5810..1e6f53be 100644
--- a/proto/buf.lock
+++ b/proto/buf.lock
@@ -1,2 +1,19 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
+deps:
+  - remote: buf.build
+    owner: cosmos
+    repository: cosmos-proto
+    commit: 1935555c206d4afb9e94615dfd0fad31
+  - remote: buf.build
+    owner: cosmos
+    repository: cosmos-sdk
+    commit: 47ab4b2a7a064892a56777ebaafca444
+  - remote: buf.build
+    owner: cosmos
+    repository: gogo-proto
+    commit: 34d970b699f84aa382f3c29773a60836
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    commit: 75b4300737fb4efca0831636be94e517
diff --git a/proto/buf.yaml b/proto/buf.yaml
index e967b9ba..c1d614df 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -1,5 +1,10 @@
 version: v1
 name: buf.build/okp4/okp4d
+deps:
+  - buf.build/cosmos/cosmos-sdk
+  - buf.build/cosmos/cosmos-proto
+  - buf.build/cosmos/gogo-proto
+  - buf.build/googleapis/googleapis
 breaking:
   use:
     - FILE