chore: resolve conflicts

test/e2e/major_upgrade_v3.go

@@ -10,16 +10,35 @@ import (
 	v2 "github.com/celestiaorg/celestia-app/v3/pkg/appconsts/v2"
 	v3 "github.com/celestiaorg/celestia-app/v3/pkg/appconsts/v3"
 	"github.com/celestiaorg/celestia-app/v3/test/e2e/testnet"
+	"github.com/celestiaorg/knuu/pkg/knuu"
 )
 
 func MajorUpgradeToV3(logger *log.Logger) error {
-	numNodes := 4
-	upgradeHeightV3 := int64(20)
+	var (
+		testName        = "MajorUpgradeToV3"
+		numNodes        = 4
+		upgradeHeightV3 = int64(10)
+	)
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
+	identifier := fmt.Sprintf("%s_%s", testName, time.Now().Format(timeFormat))
+	kn, err := knuu.New(ctx, knuu.Options{
+		Scope:        identifier,
+		ProxyEnabled: true,
+	})
+	testnet.NoError("failed to initialize Knuu", err)
+
+	kn.HandleStopSignal(ctx)
+	logger.Printf("Knuu initialized with scope %s", kn.Scope)
+
 	logger.Println("Creating testnet")
-	testNet, err := testnet.New(ctx, "MajorUpgradeToV3", seed, nil, "test")
+	testNet, err := testnet.New(testnet.Options{
+		Seed:    seed,
+		ChainID: "test",
+		Knuu:    kn,
+	})
 	testnet.NoError("failed to create testnet", err)
 
 	defer testNet.Cleanup(ctx)