146 receipt (#195)

* #146 add receipt object

* #146 update sendblock function signature

* #146 add sendBlockRequest object

* #146 add receipt table

* #146 add chaintype to send transaction message

* #146 add receipt util

* #146 pass secretphrase to p2p service

* #146 refactored p2p and blockchain sync

* #146 exposed part of peer to peer service information to client

* #146 add sender public key to send block request parameter

* #146 use public key instead of address for sender and receiver

* #146 add sender public key to send transaction request message

* #146 use new to instantiate p2p handler

* #146 do not broadcast block for genesis

* #146 increase node hardware information stream delay

* #146 rename receipt table name to node_receipt

Author: andy-shi88

api/api.go

@@ -7,8 +7,10 @@ import (
 	"net/http"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	"github.com/spf13/viper"
 	"github.com/zoobc/zoobc-core/common/interceptor"
+	"github.com/zoobc/zoobc-core/observer"
+
+	"github.com/spf13/viper"
 
 	"github.com/zoobc/zoobc-core/common/chaintype"
 	coreService "github.com/zoobc/zoobc-core/core/service"
@@ -23,7 +25,6 @@ import (
 	"github.com/zoobc/zoobc-core/common/query"
 	rpcService "github.com/zoobc/zoobc-core/common/service"
 	"github.com/zoobc/zoobc-core/common/util"
-	"github.com/zoobc/zoobc-core/observer"
 	"google.golang.org/grpc"
 )
 
@@ -42,7 +43,7 @@ func init() {
 	}
 }
 
-func startGrpcServer(port int, queryExecutor query.ExecutorInterface, p2pHostService p2p.ServiceInterface,
+func startGrpcServer(port int, queryExecutor query.ExecutorInterface, p2pHostService p2p.Peer2PeerServiceInterface,
 	blockServices map[int32]coreService.BlockServiceInterface, ownerAccountAddress, nodefilePath string) {
 	grpcServer := grpc.NewServer(
 		grpc.UnaryInterceptor(interceptor.NewServerInterceptor(apiLogger, ownerAccountAddress)),
@@ -57,8 +58,10 @@ func startGrpcServer(port int, queryExecutor query.ExecutorInterface, p2pHostSer
 		query.NewMempoolQuery(&chaintype.MainChain{}),
 		actionTypeSwitcher,
 		query.NewAccountBalanceQuery(),
+		crypto.NewSignature(),
 		query.NewTransactionQuery(&chaintype.MainChain{}),
-		observer.NewObserver())
+		observer.NewObserver(),
+	)
 	serv, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
 	if err != nil {
 		apiLogger.Fatalf("failed to listen: %v\n", err)
@@ -79,7 +82,7 @@ func startGrpcServer(port int, queryExecutor query.ExecutorInterface, p2pHostSer
 			crypto.NewSignature(),
 			actionTypeSwitcher,
 			mempoolService,
-			apiLogger,
+			observer.NewObserver(),
 		),
 	})
 	// Set GRPC handler for Transactions requests
@@ -115,7 +118,7 @@ func startGrpcServer(port int, queryExecutor query.ExecutorInterface, p2pHostSer
 }
 
 // Start starts api servers in the given port and passing query executor
-func Start(grpcPort, restPort int, queryExecutor query.ExecutorInterface, p2pHostService p2p.ServiceInterface,
+func Start(grpcPort, restPort int, queryExecutor query.ExecutorInterface, p2pHostService p2p.Peer2PeerServiceInterface,
 	blockServices map[int32]coreService.BlockServiceInterface, ownerAccountAddress, nodefilePath string) {
 	startGrpcServer(grpcPort, queryExecutor, p2pHostService, blockServices, ownerAccountAddress, nodefilePath)
 	if restPort > 0 { // only start proxy service if apiHTTPPort set with value > 0

api/handler/nodeHardwareHandler.go

@@ -32,6 +32,6 @@ func (nhh *NodeHardwareHandler) GetNodeHardware(
 		if err != nil {
 			return err // close connection if sending response to client result in error
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(5 * time.Second)
 	}
 }

api/service/hostApiService.go

@@ -16,14 +16,14 @@ type (
 	HostService struct {
 		Query         query.ExecutorInterface
 		BlockServices map[int32]coreService.BlockServiceInterface
-		P2pService    p2p.ServiceInterface
+		P2pService    p2p.Peer2PeerServiceInterface
 	}
 )
 
 var hostServiceInstance *HostService
 
-// NewHostService create a singleton instance of HostService
-func NewHostService(queryExecutor query.ExecutorInterface, p2pService p2p.ServiceInterface,
+// NewHostService create a singleton instance of PeerExplorer
+func NewHostService(queryExecutor query.ExecutorInterface, p2pService p2p.Peer2PeerServiceInterface,
 	blockServices map[int32]coreService.BlockServiceInterface) HostServiceInterface {
 	if hostServiceInstance == nil {
 		hostServiceInstance = &HostService{
@@ -36,7 +36,7 @@ func NewHostService(queryExecutor query.ExecutorInterface, p2pService p2p.Servic
 }
 
 func (hs *HostService) GetHostInfo() (*model.HostInfo, error) {
-	chainStatuses := []*model.ChainStatus{}
+	var chainStatuses []*model.ChainStatus
 	for chainType, blockService := range hs.BlockServices {
 		lastBlock, err := blockService.GetLastBlock()
 		if lastBlock == nil || err != nil {
@@ -49,15 +49,14 @@ func (hs *HostService) GetHostInfo() (*model.HostInfo, error) {
 		})
 	}
 	return &model.HostInfo{
-		Host:          hs.P2pService.GetHostInstance(),
+		Host:          hs.P2pService.GetHostInfo(),
 		ChainStatuses: chainStatuses,
 	}, nil
 }
 
 func (hs *HostService) GetHostPeers() (*model.GetHostPeersResponse, error) {
-	host := hs.P2pService.GetHostInstance()
 	return &model.GetHostPeersResponse{
-		ResolvedPeers:   host.GetResolvedPeers(),
-		UnresolvedPeers: host.GetUnresolvedPeers(),
+		ResolvedPeers:   hs.P2pService.GetResolvedPeers(),
+		UnresolvedPeers: hs.P2pService.GetUnresolvedPeers(),
 	}, nil
 }

api/service/transactionApiService.go

@@ -5,7 +5,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/zoobc/zoobc-core/observer"
+
 	"github.com/zoobc/zoobc-core/common/blocker"
 	"github.com/zoobc/zoobc-core/common/chaintype"
 	"github.com/zoobc/zoobc-core/common/crypto"
@@ -30,7 +31,7 @@ type (
 		Signature          crypto.SignatureInterface
 		ActionTypeSwitcher transaction.TypeActionSwitcher
 		MempoolService     service.MempoolServiceInterface
-		Log                *logrus.Logger
+		Observer           *observer.Observer
 	}
 )
 
@@ -42,15 +43,15 @@ func NewTransactionService(
 	signature crypto.SignatureInterface,
 	txTypeSwitcher transaction.TypeActionSwitcher,
 	mempoolService service.MempoolServiceInterface,
-	log *logrus.Logger,
+	observer *observer.Observer,
 ) *TransactionService {
 	if transactionServiceInstance == nil {
 		transactionServiceInstance = &TransactionService{
 			Query:              queryExecutor,
 			Signature:          signature,
 			ActionTypeSwitcher: txTypeSwitcher,
 			MempoolService:     mempoolService,
-			Log:                log,
+			Observer:           observer,
 		}
 	}
 	return transactionServiceInstance
@@ -208,6 +209,7 @@ func (ts *TransactionService) PostTransaction(
 		return nil, err
 	}
 
+	ts.Observer.Notify(observer.TransactionAdded, mpTx.GetTransactionBytes(), chaintype)
 	// return parsed transaction
 	return tx, nil
 }

api/service/transactionApiService_test.go

@@ -5,6 +5,7 @@ package service
 import (
 	"database/sql"
 	"errors"
+	"github.com/zoobc/zoobc-core/observer"
 	"reflect"
 	"strings"
 	"testing"
@@ -204,6 +205,7 @@ func TestTransactionService_PostTransaction(t *testing.T) {
 		ActionTypeSwitcher transaction.TypeActionSwitcher
 		MempoolService     service.MempoolServiceInterface
 		Log                *logrus.Logger
+		Observer           *observer.Observer
 	}
 	type args struct {
 		chaintype chaintype.ChainType
@@ -411,6 +413,7 @@ func TestTransactionService_PostTransaction(t *testing.T) {
 				Query:              &mockTransactionExecutorSuccess{},
 				ActionTypeSwitcher: &mockTypeSwitcherSuccess{},
 				MempoolService:     &mockMempoolServiceSuccess{},
+				Observer:           observer.NewObserver(),
 				Log:                mockLog,
 			},
 			args: args{
@@ -459,7 +462,7 @@ func TestTransactionService_PostTransaction(t *testing.T) {
 				Signature:          tt.fields.Signature,
 				ActionTypeSwitcher: tt.fields.ActionTypeSwitcher,
 				MempoolService:     tt.fields.MempoolService,
-				Log:                tt.fields.Log,
+				Observer:           tt.fields.Observer,
 			}
 			got, err := ts.PostTransaction(tt.args.chaintype, tt.args.req)
 			if (err != nil) != tt.wantErr {

common/constant/receipt.go

@@ -0,0 +1,6 @@
+package constant
+
+const (
+	ReceiptDatumTypeBlock       = uint32(1)
+	ReceiptDatumTypeTransaction = uint32(2)
+)

common/database/migration.go

@@ -122,7 +122,8 @@ func (m *Migration) Init() error {
 			);`,
 			`
 			ALTER TABLE "transaction"
-				ADD COLUMN "transaction_index" INTEGER;`,
+				ADD COLUMN "transaction_index" INTEGER AFTER "version"
+			`,
 			`
 			CREATE TABLE IF NOT EXISTS "participation_score"(
 				"node_id" INTEGER,
@@ -131,6 +132,18 @@ func (m *Migration) Init() error {
 				"height" INTEGER,
 				PRIMARY KEY("node_id", "height")
 			);`,
+			`
+			CREATE TABLE IF NOT EXISTS "node_receipt" (
+				"sender_public_key" BLOB, 
+				"recipient_public_key" BLOB,
+				"datum_type" INTEGER,
+				"datum_hash" BLOB,
+				"reference_block_height" INTEGER,
+				"reference_block_hash" BLOB,
+				"receipt_merkle_root" BLOB,
+				"recipient_signature" BLOB
+			)
+			`,
 		}
 		return nil
 	}