chore!: replace NMTProof with Proof in nmt

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

proto/buf.yaml

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

proto/tendermint/types/types.proto

@@ -5,6 +5,7 @@ option go_package = "github.com/cometbft/cometbft/proto/tendermint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
+import "proof.proto";
 import "tendermint/crypto/proof.proto";
 import "tendermint/version/types.proto";
 import "tendermint/types/validator.proto";
@@ -93,7 +94,7 @@ message Data {
   // field number 2 is reserved for intermediate state roots
   // field number 3 is reserved for evidence
   // field number 4 is reserved for blobs
-  
+
   // SquareSize is the number of rows or columns in the original data square.
   uint64 square_size = 5;
 
@@ -211,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 NMTProof 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
@@ -227,25 +228,3 @@ message RowProof {
   uint32                           start_row = 4;
   uint32                           end_row   = 5;
 }
-
-// NMTProof is a proof of a namespace.ID in an NMT.
-// In case this proof proves the absence of a namespace.ID
-// in a tree it also contains the leaf hashes of the range
-// where that namespace would be.
-message NMTProof {
-  // Start index of this proof.
-  int32 start = 1;
-  // End index of this proof.
-  int32 end = 2;
-  // Nodes that together with the corresponding leaf values can be used to
-  // recompute the root and verify this proof. Nodes should consist of the max
-  // and min namespaces along with the actual hash, resulting in each being 48
-  // bytes each
-  repeated bytes nodes = 3;
-  // leafHash are nil if the namespace is present in the NMT. In case the
-  // namespace to be proved is in the min/max range of the tree but absent, this
-  // will contain the leaf hash necessary to verify the proof of absence. Leaf
-  // hashes should consist of the namespace along with the actual hash,
-  // resulting 40 bytes total.
-  bytes leaf_hash = 4;
-}

types/share_proof.go

@@ -6,6 +6,7 @@ import (
 	"math"
 
 	"github.com/celestiaorg/nmt"
+	"github.com/celestiaorg/nmt/pb"
 	"github.com/cometbft/cometbft/pkg/consts"
 	"github.com/cometbft/cometbft/proto/tendermint/crypto"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
@@ -18,7 +19,7 @@ type ShareProof struct {
 	Data [][]byte `json:"data"`
 	// ShareProofs are NMT proofs that the shares in Data exist in a set of
 	// rows. There will be one ShareProof per row that the shares occupy.
-	ShareProofs []*tmproto.NMTProof `json:"share_proofs"`
+	ShareProofs []*pb.Proof `json:"share_proofs"`
 	// NamespaceID is the namespace id of the shares being proven. This
 	// namespace id is used when verifying the proof. If the namespace id doesn't
 	// match the namespace of the shares, the proof will fail verification.
@@ -67,7 +68,7 @@ func ShareProofFromProto(pb tmproto.ShareProof) (ShareProof, error) {
 // If the proof is not correctly constructed, it returns a sensible error.
 // Note: these proofs are tested on the app side.
 func (sp ShareProof) Validate() error {
-	numberOfSharesInProofs := int32(0)
+	numberOfSharesInProofs := int64(0)
 	for _, proof := range sp.ShareProofs {
 		// the range is not inclusive from the left.
 		numberOfSharesInProofs += proof.End - proof.Start
@@ -103,7 +104,7 @@ func (sp ShareProof) VerifyProof(root []byte) bool {
 	if err := sp.Validate(); err != nil {
 		return false
 	}
-	cursor := int32(0)
+	cursor := int64(0)
 	for i, proof := range sp.ShareProofs {
 		nmtProof := nmt.NewInclusionProof(
 			int(proof.Start),

types/share_proof_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
+	"github.com/celestiaorg/nmt/pb"
 	"github.com/cometbft/cometbft/pkg/consts"
-	"github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -100,7 +100,7 @@ func TestShareProofVerify(t *testing.T) {
 
 func mismatchedShareProofs() ShareProof {
 	sp := validShareProof()
-	sp.ShareProofs = []*types.NMTProof{}
+	sp.ShareProofs = []*pb.Proof{}
 	return sp
 }
 
@@ -116,7 +116,7 @@ func mismatchedShares() ShareProof {
 func validShareProof() ShareProof {
 	return ShareProof{
 		Data: [][]uint8{{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x62, 0xc, 0x0, 0x0, 0x0, 0x2a, 0xf4, 0x3, 0xff, 0xe8, 0x78, 0x6c, 0x48, 0x84, 0x9, 0x5, 0x5, 0x79, 0x8f, 0x29, 0x67, 0xa2, 0xe1, 0x8d, 0x2f, 0xdc, 0xf2, 0x60, 0xe4, 0x62, 0x71, 0xf9, 0xae, 0x92, 0x83, 0x3a, 0x7f, 0xf3, 0xc6, 0x14, 0xb4, 0x17, 0xfc, 0x64, 0x4b, 0x89, 0x18, 0x5e, 0x22, 0x4b, 0x0, 0x82, 0xeb, 0x67, 0x5b, 0x51, 0x43, 0x4e, 0xc3, 0x42, 0x48, 0xc1, 0xfd, 0x88, 0x71, 0xcb, 0xee, 0xf3, 0x92, 0x20, 0x9c, 0x15, 0xc0, 0x4f, 0x11, 0xa4, 0x5, 0xd0, 0xdf, 0xb8, 0x25, 0x60, 0x58, 0xae, 0x2, 0x2d, 0x78, 0xf8, 0x1f, 0x67, 0xeb, 0x88, 0x58, 0x5d, 0x5a, 0x4a, 0x74, 0xe7, 0xdf, 0x38, 0x6a, 0xa4, 0x3f, 0x62, 0xd6, 0x3d, 0x17, 0xd2, 0x7e, 0x92, 0x9c, 0x4a, 0xd0, 0x2b, 0x55, 0x49, 0x3b, 0xa7, 0x5a, 0x29, 0xd5, 0x6b, 0x91, 0xde, 0xfe, 0x5b, 0x39, 0x88, 0xc5, 0xbb, 0x91, 0x16, 0xf6, 0x47, 0xec, 0x8, 0x3, 0x2a, 0x1e, 0x6e, 0x4b, 0x27, 0x34, 0x90, 0x38, 0x46, 0x6e, 0xce, 0x35, 0xdf, 0xd6, 0x1e, 0x1a, 0xf2, 0xf0, 0x6e, 0xa0, 0xfe, 0x84, 0x51, 0xf2, 0xc1, 0x32, 0xd, 0x89, 0x17, 0x5f, 0x4c, 0xab, 0x81, 0xd4, 0x44, 0x5a, 0x55, 0xdb, 0xe5, 0xa7, 0x3c, 0x42, 0xb6, 0xb3, 0x20, 0xc4, 0x81, 0x75, 0x8, 0x5e, 0x39, 0x21, 0x51, 0x4c, 0x93, 0x2c, 0x7c, 0xb3, 0xd0, 0x37, 0xf9, 0x6a, 0xab, 0x93, 0xf0, 0x3f, 0xa2, 0x44, 0x1f, 0x63, 0xae, 0x96, 0x4e, 0x26, 0x7a, 0x1f, 0x18, 0x5b, 0x28, 0x4d, 0x24, 0xe8, 0x98, 0x56, 0xbf, 0x98, 0x44, 0x23, 0x17, 0x85, 0x22, 0x38, 0x56, 0xeb, 0xf3, 0x4e, 0x87, 0x1e, 0xc1, 0x51, 0x6, 0x71, 0xa7, 0xa9, 0x45, 0xef, 0xc7, 0x89, 0x5c, 0xed, 0x68, 0xbd, 0x43, 0x2f, 0xe6, 0xf1, 0x56, 0xef, 0xf, 0x4f, 0x57, 0xaa, 0x8c, 0x5c, 0xbd, 0x21, 0xb4, 0xaa, 0x15, 0x71, 0x6a, 0xdc, 0x12, 0xda, 0xee, 0xd9, 0x19, 0xbc, 0x17, 0xa2, 0x49, 0xd6, 0xbe, 0xd2, 0xc6, 0x6a, 0xbc, 0x53, 0xe4, 0x28, 0xd4, 0xeb, 0xe9, 0x9b, 0xd6, 0x85, 0x89, 0xb9, 0xe8, 0xa2, 0x70, 0x40, 0xad, 0xb1, 0x1a, 0xa0, 0xb1, 0xb5, 0xee, 0xde, 0x6d, 0xa9, 0x2a, 0x4b, 0x6, 0xd1, 0xfa, 0x67, 0x13, 0xac, 0x7d, 0x9a, 0x81, 0xc6, 0xef, 0x78, 0x42, 0x18, 0xf, 0x7b, 0xaf, 0x50, 0xa7, 0xdb, 0xb6, 0xde, 0xab, 0x3, 0xdc, 0x5, 0x14, 0x5f, 0x9, 0xdb, 0x81, 0xe3, 0x72, 0x2, 0x61, 0x23, 0x77, 0x12, 0x82, 0xfc, 0x9, 0x43, 0xfb, 0xd6, 0x38, 0x53, 0xfd, 0x77, 0xe, 0x17, 0xcc, 0x93, 0x5e, 0x4e, 0x60, 0x87, 0xda, 0xbd, 0xfc, 0x86, 0xdd, 0xb1, 0xd6, 0x74, 0x41, 0x71, 0x24, 0xda, 0x1, 0x3f, 0x11, 0x17, 0x9e, 0x54, 0x66, 0xb6, 0xc4, 0x9a, 0xb8, 0x59, 0xb9, 0x13, 0x4e, 0xed, 0x8, 0xe5, 0x99, 0x27, 0xa0, 0x6b, 0x1, 0x6c, 0x8a, 0xbf, 0x20, 0x3d, 0x75, 0xd5, 0x7e, 0xea, 0xe0, 0xef, 0x7f, 0xfe, 0xa8, 0xaf, 0x76, 0xad, 0x30, 0x55, 0x65, 0x9d, 0xbe, 0x30, 0x32, 0x9f, 0x3b, 0xb7, 0xa1, 0x5c, 0x98, 0xef, 0xe1, 0xe4, 0x33, 0x1a, 0x56, 0x5a, 0x22, 0xd1, 0x38, 0x9b, 0xee, 0xfa, 0x11, 0x6f, 0xa7, 0xd7, 0x6, 0x17, 0xdc, 0xc6, 0x4d, 0xbd, 0x3f, 0x3c, 0xe6, 0xac, 0x54, 0x70, 0xda, 0x11, 0xdb, 0x87, 0xe2, 0xc2, 0x26, 0x7e, 0x48, 0x3b, 0xda, 0xf4, 0x98, 0x3c, 0x51}},
-		ShareProofs: []*types.NMTProof{
+		ShareProofs: []*pb.Proof{
 			{
 				Start:    0,
 				End:      1,