feat!: versioned namespaces (#987)

* feat!: increase tx namespace id to 32 bytes (#969) * feat!: increase tx namespace id to 32 bytes * copy constants * deduplicate constants * fix mempool tests * fix one more test * feat!: versioned namespaces (#985) * feat!: versioned namespaces * fix: share proof test * fix: check for shareVersion overflow * test: replace 8 byte namespace IDs in test
celestiaorg · Mar 27, 2023 · e3bad3d · e3bad3d
1 parent 2fe81fb
commit e3bad3d
Show file tree

Hide file tree

Showing 13 changed files with 314 additions and 196 deletions.
diff --git a/mempool/cat/pool_test.go b/mempool/cat/pool_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/mempool"
+	"github.com/tendermint/tendermint/pkg/consts"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
@@ -654,12 +655,14 @@ func TestTxPool_RemoveBlobTx(t *testing.T) {
 	originalTx := []byte{1, 2, 3, 4}
 	indexWrapper, err := types.MarshalIndexWrapper(originalTx, 100)
 	require.NoError(t, err)
+	namespaceOne := bytes.Repeat([]byte{1}, consts.NamespaceIDSize)
 
 	// create the blobTx
 	b := tmproto.Blob{
-		NamespaceId:  []byte{1, 2, 3, 4, 5, 6, 7, 8},
-		Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-		ShareVersion: 0,
+		NamespaceId:      namespaceOne,
+		Data:             []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+		ShareVersion:     0,
+		NamespaceVersion: 0,
 	}
 	bTx, err := types.MarshalBlobTx(originalTx, &b)
 	require.NoError(t, err)

diff --git a/mempool/v0/clist_mempool_test.go b/mempool/v0/clist_mempool_test.go
@@ -1,6 +1,7 @@
 package v0
 
 import (
+	"bytes"
 	"crypto/rand"
 	"encoding/binary"
 	"fmt"
@@ -25,6 +26,7 @@ import (
 	cmtrand "github.com/tendermint/tendermint/libs/rand"
 	"github.com/tendermint/tendermint/libs/service"
 	"github.com/tendermint/tendermint/mempool"
+	"github.com/tendermint/tendermint/pkg/consts"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
@@ -684,6 +686,7 @@ func TestMempoolRemoteAppConcurrency(t *testing.T) {
 func TestRemoveBlobTx(t *testing.T) {
 	app := kvstore.NewApplication()
 	cc := proxy.NewLocalClientCreator(app)
+	namespaceOne := bytes.Repeat([]byte{1}, consts.NamespaceIDSize)
 
 	cfg := config.ResetTestRoot("mempool_test")
 
@@ -697,9 +700,10 @@ func TestRemoveBlobTx(t *testing.T) {
 
 	// create the blobTx
 	b := tmproto.Blob{
-		NamespaceId:  []byte{1, 2, 3, 4, 5, 6, 7, 8},
-		Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-		ShareVersion: 0,
+		NamespaceId:      namespaceOne,
+		Data:             []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+		ShareVersion:     0,
+		NamespaceVersion: 0,
 	}
 	bTx, err := types.MarshalBlobTx(originalTx, &b)
 	require.NoError(t, err)

diff --git a/mempool/v1/mempool_test.go b/mempool/v1/mempool_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/mempool"
+	"github.com/tendermint/tendermint/pkg/consts"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
@@ -657,16 +658,18 @@ func TestTxMempool_CheckTxPostCheckError(t *testing.T) {
 
 func TestRemoveBlobTx(t *testing.T) {
 	txmp := setup(t, 500)
+	namespaceOne := bytes.Repeat([]byte{1}, consts.NamespaceIDSize)
 
 	originalTx := []byte{1, 2, 3, 4}
 	indexWrapper, err := types.MarshalIndexWrapper(originalTx, 100)
 	require.NoError(t, err)
 
 	// create the blobTx
 	b := tmproto.Blob{
-		NamespaceId:  []byte{1, 2, 3, 4, 5, 6, 7, 8},
-		Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-		ShareVersion: 0,
+		NamespaceId:      namespaceOne,
+		Data:             []byte{1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+		ShareVersion:     0,
+		NamespaceVersion: 0,
 	}
 	bTx, err := types.MarshalBlobTx(originalTx, &b)
 	require.NoError(t, err)

diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go
@@ -2,8 +2,6 @@ package consts
 
 import (
 	"crypto/sha256"
-
-	"github.com/celestiaorg/nmt/namespace"
 )
 
 const (
@@ -23,15 +21,21 @@ const (
 	// ProtoIndexWrapperTypeID is included in each encoded IndexWrapper to help prevent
 	// decoding binaries that are not actually IndexWrappers.
 	ProtoIndexWrapperTypeID = "INDX"
+
+	// NamespaveVersionSize is the size of a namespace version in bytes.
+	NamespaceVersionSize = 1
+
+	// NamespaceIDSize is the size of a namespace ID in bytes.
+	NamespaceIDSize = 32
+
+	// NamespaceSize is the size of a namespace in bytes.
+	NamespaceSize = NamespaceIDSize + NamespaceVersionSize
 )
 
 var (
-	// See spec for further details on the types of available data
-	// https://github.com/celestiaorg/celestia-specs/blob/master/src/specs/consensus.md#reserved-namespace-ids
-	// https://github.com/celestiaorg/celestia-specs/blob/de5f4f74f56922e9fa735ef79d9e6e6492a2bad1/specs/data_structures.md#availabledata
-
-	// TxNamespaceID is the namespace reserved for transaction data
-	TxNamespaceID = namespace.ID{0, 0, 0, 0, 0, 0, 0, 1}
+	// TxNamespaceID is the namespace ID reserved for transaction data. It does
+	// not contain a leading version byte.
+	TxNamespaceID = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
 
 	// NewBaseHashFunc change accordingly if another hash.Hash should be used as a base hasher in the NMT:
 	NewBaseHashFunc = sha256.New