Merge pull request #6790 from spacemeshos/node-split-poc-merge-develop

merge develop to node-split-poc

Author: poszu

CHANGELOG.md

@@ -20,10 +20,6 @@ pointing to the running `node` service.
 
 ### Highlights
 
-This release will enable syncv2 fully to sync ATXs for all nodes. This should greatly reduce the time it takes to sync
-a node from genesis and the amount of data that is needed to be exchanged with the network to keep a node in sync. The
-improvements are enabled automatically after upgrading to this version and no user action is needed.
-
 Development on ATXv2 has concluded and the feature is now enabled on mainnet. Nodes will produce the new ATX format
 starting from epoch 45 and ever epoch after. The new ATXs also comes with new malfeasance proofs that are more efficient
 in terms of data size and more easily extendable in the future.

activation/handler_v1.go

@@ -498,7 +498,7 @@ func (h *HandlerV1) storeAtx(
 	malicious := false
 	var proof *mwire.MalfeasanceProof // legacy malfeasance proofs
 	var proof2 wire.Proof             // new malfeasance proofs
-	if err := h.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+	if err := h.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 		var err error
 		malicious, err = identities.IsMalicious(tx, atx.SmesherID)
 		if err != nil {

activation/handler_v1_test.go

@@ -363,7 +363,7 @@ func TestHandlerV1_SyntacticallyValidateAtx(t *testing.T) {
 				require.Equal(t, mwire.InvalidPostIndex, mp.Proof.Type)
 
 				// check if no transaction is currently open in the DB, since otherwise it could cause a deadlock
-				require.NoError(t, atxHdlr.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+				require.NoError(t, atxHdlr.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 					mal, err := identities.IsMalicious(tx, sig.NodeID())
 					require.NoError(t, err)
 					require.False(t, mal)
@@ -728,7 +728,7 @@ func TestHandlerV1_StoreAtx(t *testing.T) {
 				require.Equal(t, mwire.MultipleATXs, mp.Proof.Type)
 
 				// check if no transaction is currently open in the DB, since otherwise it could cause a deadlock
-				require.NoError(t, atxHdlr.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+				require.NoError(t, atxHdlr.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 					mal, err := identities.IsMalicious(tx, sig.NodeID())
 					require.NoError(t, err)
 					require.False(t, mal)
@@ -824,7 +824,7 @@ func TestHandlerV1_StoreAtx(t *testing.T) {
 				require.Equal(t, mwire.InvalidPrevATX, mp.Proof.Type)
 
 				// check if no transaction is currently open in the DB, since otherwise it could cause a deadlock
-				require.NoError(t, atxHdlr.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+				require.NoError(t, atxHdlr.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 					mal, err := identities.IsMalicious(tx, sig.NodeID())
 					require.NoError(t, err)
 					require.False(t, mal)
@@ -898,7 +898,7 @@ func TestHandlerV1_StoreAtx(t *testing.T) {
 		atxHdlr.mMalPublish.EXPECT().Publish(t.Context(), sig.NodeID(), gomock.Any()).DoAndReturn(
 			func(ctx context.Context, _ types.NodeID, proof wire.Proof) error {
 				// check if no transaction is currently open in the DB, since otherwise it could cause a deadlock
-				require.NoError(t, atxHdlr.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+				require.NoError(t, atxHdlr.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 					mal, err := identities.IsMalicious(tx, sig.NodeID())
 					require.NoError(t, err)
 					require.False(t, mal)

activation/handler_v2.go

@@ -979,7 +979,7 @@ func (h *HandlerV2) storeAtx(ctx context.Context, atx *types.ActivationTx, watx
 	malicious := false
 	var proof wire.Proof
 	var nodeID types.NodeID
-	if err := h.cdb.WithTxImmediate(ctx, func(tx sql.Transaction) error {
+	if err := h.cdb.WithTxImmediate(func(tx sql.Transaction) error {
 		if len(watx.marriages) != 0 {
 			newMarriageID, err := marriage.NewID(tx)
 			if err != nil {

api/grpcserver/v1/transaction_service_test.go

@@ -37,7 +37,7 @@ func TestTransactionService_StreamResults(t *testing.T) {
 	gen := fixture.NewTransactionResultGenerator().
 		WithAddresses(2)
 	txs := make([]types.TransactionWithResult, 100)
-	require.NoError(t, db.WithTxImmediate(ctx, func(dtx sql.Transaction) error {
+	require.NoError(t, db.WithTxImmediate(func(dtx sql.Transaction) error {
 		for i := range txs {
 			tx := gen.Next()
 
@@ -137,17 +137,14 @@ func TestTransactionService_StreamResults(t *testing.T) {
 func BenchmarkStreamResults(b *testing.B) {
 	db := statesql.InMemoryTest(b)
 
-	ctx, cancel := context.WithTimeout(b.Context(), 10*time.Second)
-	defer cancel()
-
 	var (
 		gen      = fixture.NewTransactionResultGenerator().WithAddresses(10_000)
 		count    = map[types.Address]int{}
 		maxaddr  types.Address
 		maxcount int
 		start    = time.Now()
 	)
-	tx, err := db.Tx(ctx)
+	tx, err := db.Tx()
 	require.NoError(b, err)
 	for range 1_000 {
 		rst := gen.Next()
@@ -174,6 +171,9 @@ func BenchmarkStreamResults(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
 
+	ctx, cancel := context.WithTimeout(b.Context(), 10*time.Second)
+	defer cancel()
+
 	stats := runtime.MemStats{}
 	for range b.N {
 		stream, err := client.StreamResults(ctx, &pb.TransactionResultsRequest{Address: maxaddr.String()})

api/grpcserver/v2alpha1/malfeasance.go

@@ -59,7 +59,7 @@ func (s *MalfeasanceService) List(
 	}
 
 	result := &spacemeshv2alpha1.MalfeasanceList{}
-	err := s.db.WithTx(ctx, func(tx sql.Transaction) error {
+	err := s.db.WithTx(func(tx sql.Transaction) error {
 		legacyCount, err := identities.CountMalicious(tx)
 		if err != nil {
 			return status.Error(codes.Internal, err.Error())

api/grpcserver/v2alpha1/transaction_test.go

@@ -43,7 +43,7 @@ func TestTransactionService_List(t *testing.T) {
 
 	gen := fixture.NewTransactionResultGenerator().WithAddresses(2)
 	txsList := make([]types.TransactionWithResult, 100)
-	require.NoError(t, db.WithTxImmediate(ctx, func(dtx sql.Transaction) error {
+	require.NoError(t, db.WithTxImmediate(func(dtx sql.Transaction) error {
 		for i := range txsList {
 			tx := gen.Next()
 

api/grpcserver/v2beta1/malfeasance.go

@@ -63,7 +63,7 @@ func (s *MalfeasanceService) List(
 	}
 
 	result := &spacemeshv2beta1.MalfeasanceList{}
-	err := s.db.WithTx(ctx, func(tx sql.Transaction) error {
+	err := s.db.WithTx(func(tx sql.Transaction) error {
 		legacyCount, err := identities.CountMalicious(tx)
 		if err != nil {
 			return status.Error(codes.Internal, err.Error())

api/grpcserver/v2beta1/transaction_test.go

@@ -43,7 +43,7 @@ func TestTransactionService_List(t *testing.T) {
 
 	gen := fixture.NewTransactionResultGenerator().WithAddresses(2)
 	txsList := make([]types.TransactionWithResult, 100)
-	require.NoError(t, db.WithTxImmediate(ctx, func(dtx sql.Transaction) error {
+	require.NoError(t, db.WithTxImmediate(func(dtx sql.Transaction) error {
 		for i := range txsList {
 			tx := gen.Next()
 

atxsdata/warmup.go

@@ -1,7 +1,6 @@
 package atxsdata
 
 import (
-	"context"
 	"fmt"
 	"time"
 
@@ -21,7 +20,7 @@ func Warm(db sql.StateDatabase, keep types.EpochID, logger *zap.Logger, signers
 	for _, sig := range signers {
 		cache.Register(sig)
 	}
-	tx, err := db.Tx(context.Background())
+	tx, err := db.Tx()
 	if err != nil {
 		return nil, err
 	}