move root generation func to merkle package, tx root by items of [txID + result]

Author: bianyuanop

chain/block.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/consts"
+	"github.com/ava-labs/hypersdk/merkle"
 	"github.com/ava-labs/hypersdk/state"
 	"github.com/ava-labs/hypersdk/utils"
 	"github.com/ava-labs/hypersdk/window"
@@ -293,16 +294,17 @@ func (b *StatelessBlock) initializeBuilt(
 	}
 
 	// transaction hash generation
-	merkleItems := make([][]byte, 0, len(b.Txs)+len(b.results))
-	for _, tx := range b.Txs {
-		merkleItems = append(merkleItems, tx.Bytes())
-	}
-	for _, result := range b.results {
-		merkleItems = append(merkleItems, result.Output)
+	// [len(b.Txs)] should be equal to [b.results]
+	merkleItems := make([][]byte, 0, len(b.Txs))
+	for i := 0; i < len(b.Txs); i++ {
+		txID := b.Txs[i].ID()
+		resultOutput := b.results[i].Output
+		// [txID + resultOutput]
+		merkleItems = append(merkleItems, append(txID[:], resultOutput...))
 	}
 
 	// consume bytes to avoid extra copying
-	root, _, err := utils.GenerateMerkleRoot(ctx, b.vm.Tracer(), merkleItems, true)
+	root, _, err := merkle.GenerateMerkleRoot(ctx, b.vm.Tracer(), merkleItems, true)
 	if err != nil {
 		return err
 	}

merkle/merkle.go

@@ -0,0 +1,52 @@
+package merkle
+
+import (
+	"context"
+
+	"github.com/ava-labs/avalanchego/database"
+	"github.com/ava-labs/avalanchego/database/memdb"
+	"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) {
+	batchOps := make([]database.BatchOp, 0, len(merkleItems))
+
+	for _, item := range merkleItems {
+		key := utils.ToID(item)
+		batchOps = append(batchOps, database.BatchOp{
+			Key:   key[:],
+			Value: item,
+		})
+	}
+
+	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
+	}
+
+	view, err := db.NewView(ctx, merkledb.ViewChanges{BatchOps: batchOps, ConsumeBytes: consumeBytes})
+	if err != nil {
+		return nil, nil, err
+	}
+	if err := view.CommitToDB(ctx); err != nil {
+		return nil, nil, err
+	}
+
+	root, err := db.GetMerkleRoot(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return root[:], db, nil
+}

utils/utils.go

@@ -4,7 +4,6 @@
 package utils
 
 import (
-	"context"
 	"fmt"
 	"math"
 	"net"
@@ -14,14 +13,9 @@ import (
 	"strconv"
 	"time"
 
-	"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/hashing"
 	"github.com/ava-labs/avalanchego/utils/perms"
-	"github.com/ava-labs/avalanchego/utils/units"
-	"github.com/ava-labs/avalanchego/x/merkledb"
 	"github.com/ava-labs/hypersdk/consts"
 	formatter "github.com/onsi/ginkgo/v2/formatter"
 )
@@ -122,43 +116,3 @@ func LoadBytes(filename string, expectedSize int) ([]byte, error) {
 	}
 	return bytes, nil
 }
-
-// Generate merkle root for a set of items
-func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems [][]byte, consumeBytes bool) ([]byte, merkledb.MerkleDB, error) {
-	batchOps := make([]database.BatchOp, 0, len(merkleItems))
-
-	for _, item := range merkleItems {
-		key := ToID(item)
-		batchOps = append(batchOps, database.BatchOp{
-			Key:   key[:],
-			Value: item,
-		})
-	}
-
-	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
-	}
-
-	view, err := db.NewView(ctx, merkledb.ViewChanges{BatchOps: batchOps, ConsumeBytes: consumeBytes})
-	if err != nil {
-		return nil, nil, err
-	}
-	if err := view.CommitToDB(ctx); err != nil {
-		return nil, nil, err
-	}
-
-	root, err := db.GetMerkleRoot(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return root[:], db, nil
-}