393 mempool rollback step backup mempool transactions into badgerdb

Gopkg.toml

@@ -85,3 +85,7 @@
 [[constraint]]
   name = "github.com/prometheus/client_golang"
   version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/golang/mock"
+  version = "1.3.1"

api/api.go

@@ -6,24 +6,20 @@ import (
 	"net"
 	"net/http"
 
-	log "github.com/sirupsen/logrus"
-	"github.com/zoobc/zoobc-core/common/kvdb"
-
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	"github.com/zoobc/zoobc-core/common/interceptor"
-	"github.com/zoobc/zoobc-core/observer"
-
-	"github.com/zoobc/zoobc-core/common/chaintype"
-	coreService "github.com/zoobc/zoobc-core/core/service"
-	"github.com/zoobc/zoobc-core/p2p"
-
-	"github.com/zoobc/zoobc-core/common/crypto"
-	"github.com/zoobc/zoobc-core/common/transaction"
-
+	log "github.com/sirupsen/logrus"
 	"github.com/zoobc/zoobc-core/api/handler"
 	"github.com/zoobc/zoobc-core/api/service"
+	"github.com/zoobc/zoobc-core/common/chaintype"
+	"github.com/zoobc/zoobc-core/common/crypto"
+	"github.com/zoobc/zoobc-core/common/interceptor"
+	"github.com/zoobc/zoobc-core/common/kvdb"
 	"github.com/zoobc/zoobc-core/common/query"
 	rpcService "github.com/zoobc/zoobc-core/common/service"
+	"github.com/zoobc/zoobc-core/common/transaction"
+	coreService "github.com/zoobc/zoobc-core/core/service"
+	"github.com/zoobc/zoobc-core/observer"
+	"github.com/zoobc/zoobc-core/p2p"
 	"google.golang.org/grpc"
 )
 
@@ -35,6 +31,9 @@ func startGrpcServer(
 	blockServices map[int32]coreService.BlockServiceInterface, ownerAccountAddress, nodefilePath string,
 	logger *log.Logger,
 ) {
+
+	chainType := chaintype.GetChainType(0)
+
 	grpcServer := grpc.NewServer(
 		grpc.UnaryInterceptor(interceptor.NewServerInterceptor(logger, ownerAccountAddress)),
 		grpc.StreamInterceptor(interceptor.NewStreamInterceptor(ownerAccountAddress)),
@@ -43,15 +42,15 @@ func startGrpcServer(
 		Executor: queryExecutor,
 	}
 	mempoolService := coreService.NewMempoolService(
-		&chaintype.MainChain{},
-		kvExecutor,
+		chainType, kvExecutor,
 		queryExecutor,
-		query.NewMempoolQuery(&chaintype.MainChain{}),
+		query.NewMempoolQuery(chainType),
 		query.NewMerkleTreeQuery(),
 		actionTypeSwitcher,
 		query.NewAccountBalanceQuery(),
+		query.NewBlockQuery(chainType),
+		query.NewTransactionQuery(chainType),
 		crypto.NewSignature(),
-		query.NewTransactionQuery(&chaintype.MainChain{}),
 		observer.NewObserver(),
 		logger,
 	)
@@ -71,8 +70,7 @@ func startGrpcServer(
 	// Set GRPC handler for Transactions requests
 	rpcService.RegisterTransactionServiceServer(grpcServer, &handler.TransactionHandler{
 		Service: service.NewTransactionService(
-			queryExecutor,
-			crypto.NewSignature(),
+			queryExecutor, crypto.NewSignature(),
 			actionTypeSwitcher,
 			mempoolService,
 			observer.NewObserver(),

api/service/mempoolTransactionApiService_test.go

@@ -24,7 +24,7 @@ func TestNewMempoolTransactionsService(t *testing.T) {
 		want *MempoolTransactionService
 	}{
 		{
-			name: "NewMempoolTranscationService",
+			name: "NewMempoolTransactionService",
 			args: args{
 				queryExecutor: &query.Executor{},
 			},
@@ -72,6 +72,7 @@ func (*mockQueryExecutorGetMempoolTXs) ExecuteSelect(qStr string, tx bool, args
 			WillReturnRows(sqlmock.NewRows(query.NewMempoolQuery(&chaintype.MainChain{}).Fields).
 				AddRow(
 					1,
+					0,
 					1,
 					1000,
 					make([]byte, 88),
@@ -215,6 +216,7 @@ func (*mockQueryExecutorGetMempoolTXSuccess) ExecuteSelectRow(qStr string, args
 	mock.ExpectQuery(regexp.QuoteMeta(qStr)).
 		WillReturnRows(sqlmock.NewRows(query.NewMempoolQuery(&chaintype.MainChain{}).Fields).AddRow(
 			1,
+			0,
 			1,
 			1000,
 			make([]byte, 88),

api/service/transactionApiService_test.go

@@ -206,8 +206,13 @@ func TestNewTransactionService(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := NewTransactionService(query.NewQueryExecutor(db),
-				nil, nil, nil, nil); !reflect.DeepEqual(got, tt.want) {
+			if got := NewTransactionService(
+				query.NewQueryExecutor(db),
+				nil,
+				nil,
+				nil,
+				nil,
+			); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("NewTransactionService() = %v, want %v", got, tt.want)
 			}
 			defer resetTransactionService()

cmd/block/blockGenerator.go

@@ -108,8 +108,9 @@ func initialize(
 		query.NewMerkleTreeQuery(),
 		actionSwitcher,
 		query.NewAccountBalanceQuery(),
-		crypto.NewSignature(),
+		query.NewBlockQuery(chainType),
 		query.NewTransactionQuery(chainType),
+		crypto.NewSignature(),
 		observerInstance,
 		log.New(),
 	)

cmd/transaction/generator.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/zoobc/zoobc-core/common/chaintype"
 	"github.com/zoobc/zoobc-core/common/constant"
@@ -246,6 +247,9 @@ func GenerateBasicTransaction(senderSeed string,
 	recipientAccountAddress string,
 ) *model.Transaction {
 	senderAccountAddress := util.GetAddressFromSeed(senderSeed)
+	if timestamp <= 0 {
+		timestamp = time.Now().Unix()
+	}
 	return &model.Transaction{
 		Version:                 version,
 		Timestamp:               timestamp,

common/blocker/blocker.go

@@ -17,6 +17,7 @@ type (
 
 var (
 	DBErr                   TypeBlocker = "DBErr"
+	DBRowNotFound           TypeBlocker = "DBRowNotFound"
 	BlockErr                TypeBlocker = "BlockErr"
 	BlockNotFoundErr        TypeBlocker = "BlockNotFoundErr"
 	RequestParameterErr     TypeBlocker = "RequestParameterErr"

common/constant/kvdb.go

@@ -1,7 +1,11 @@
 package constant
 
+import "time"
+
 var (
+	KVdbExpiryReceiptReminder       = 43200 // one month adjust later
 	KVdbTableBlockReminderKey       = "block_reminder_"
 	KVdbTableTransactionReminderKey = "transaction_reminder_"
-	KVdbExpiryReceiptReminder       = 43200 // one month adjust later
+	KVDBMempoolsBackup              = "mempools_backup"
+	KVDBMempoolsBackupExpiry        = 60 * time.Minute
 )

common/database/migration.go

@@ -199,6 +199,10 @@ func (m *Migration) Init() error {
 				"blocksmith_index" INTEGER
 			)
 			`,
+			`
+			ALTER TABLE "mempool"
+				ADD COLUMN "block_height" INTEGER AFTER "id"
+			`,
 		}
 		return nil
 	}