rebase & blk marshal/unmarshal & merkleroot to ids.ID

merkle/merkle.go

@@ -5,14 +5,15 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/memdb"
+	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/x/merkledb"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
 // Generate merkle root for a set of items
-func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems [][]byte, consumeBytes bool) ([]byte, merkledb.MerkleDB, error) {
+func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems [][]byte, consumeBytes bool) (ids.ID, merkledb.MerkleDB, error) {
 	batchOps := make([]database.BatchOp, 0, len(merkleItems))
 
 	for _, item := range merkleItems {
@@ -26,27 +27,26 @@ func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems []
 	db, err := merkledb.New(ctx, memdb.New(), merkledb.Config{
 		BranchFactor:              merkledb.BranchFactor16,
 		HistoryLength:             100,
-		EvictionBatchSize:         units.MiB,
 		IntermediateNodeCacheSize: units.MiB,
 		ValueNodeCacheSize:        units.MiB,
 		Tracer:                    tracer,
 	})
 	if err != nil {
-		return nil, nil, err
+		return ids.Empty, nil, err
 	}
 
 	view, err := db.NewView(ctx, merkledb.ViewChanges{BatchOps: batchOps, ConsumeBytes: consumeBytes})
 	if err != nil {
-		return nil, nil, err
+		return ids.Empty, nil, err
 	}
 	if err := view.CommitToDB(ctx); err != nil {
-		return nil, nil, err
+		return ids.Empty, nil, err
 	}
 
 	root, err := db.GetMerkleRoot(ctx)
 	if err != nil {
-		return nil, nil, err
+		return ids.Empty, nil, err
 	}
 
-	return root[:], db, nil
+	return root, db, nil
 }