use buf.build for nmt.proof

celestiaorg · Oct 8, 2024 · 72447cd · 72447cd
1 parent 7630f83
commit 72447cd
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 132 deletions.
diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ endif
 
 proto-gen: check-proto-deps
 	@echo "Generating Protobuf files"
-	@go run github.com/bufbuild/buf/cmd/buf@$(BUF_VERSION) generate --exclude-path proto/nmt
+	@go run github.com/bufbuild/buf/cmd/buf@$(BUF_VERSION) generate
 	@mv ./proto/tendermint/abci/types.pb.go ./abci/types/
 	@cp ./proto/tendermint/rpc/grpc/types.pb.go ./rpc/grpc
 .PHONY: proto-gen

diff --git a/proto/buf.lock b/proto/buf.lock
@@ -1,6 +1,11 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
+  - remote: buf.build
+    owner: celestia
+    repository: nmt
+    commit: 686a5caececf476e8b8e26994f837778
+    digest: shake256:30dc63aaf2ba645c37e0d369029bdf3a8c97663eb1ef37548a62bfd48dd7904abd3ecd8ef7e92b3c3cae3eba3360ca73c81558c807ff03c1953a944c251c75e9
   - remote: buf.build
     owner: gogo
     repository: protobuf

diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -1,6 +1,7 @@
 version: v1
 deps:
   - buf.build/gogo/protobuf
+  - buf.build/celestia/nmt:v0.22.2
 breaking:
   use:
     - FILE

diff --git a/proto/nmt/proof.proto b/proto/nmt/proof.proto
diff --git a/proto/tendermint/store/types.pb.go b/proto/tendermint/store/types.pb.go
diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go
diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto
@@ -5,7 +5,7 @@ option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
-import "nmt/proof.proto";
+import "proof.proto";
 import "tendermint/crypto/proof.proto";
 import "tendermint/version/types.proto";
 import "tendermint/types/validator.proto";
@@ -212,11 +212,11 @@ message BlobTx {
 // ShareProof is an NMT proof that a set of shares exist in a set of rows and a
 // Merkle proof that those rows exist in a Merkle tree with a given data root.
 message ShareProof {
-  repeated bytes     data              = 1;
-  repeated nmt.Proof share_proofs      = 2;
-  bytes              namespace_id      = 3;
-  RowProof           row_proof         = 4;
-  uint32             namespace_version = 5;
+  repeated bytes          data              = 1;
+  repeated proof.pb.Proof share_proofs      = 2;
+  bytes                   namespace_id      = 3;
+  RowProof                row_proof         = 4;
+  uint32                  namespace_version = 5;
 }
 
 // RowProof is a Merkle proof that a set of rows exist in a Merkle tree with a