rpc:add get finalized block interface

client/queueprotocol.go

@@ -1235,3 +1235,20 @@ func (q *QueueProtocol) GetHighestBlockNum(param *types.ReqNil) (*types.ReplyBlo
 	}
 	return nil, types.ErrInvalidParam
 }
+
+// GetFinalizedBlock get finalized block choice
+func (q *QueueProtocol) GetFinalizedBlock() (*types.SnowChoice, error) {
+
+	cli := q.client
+	msg := cli.NewMessage("blockchain", types.EventSnowmanLastChoice, &types.ReqNil{})
+	err := cli.Send(msg, true)
+	if err != nil {
+		return nil, err
+	}
+
+	reply, err := cli.Wait(msg)
+	if err != nil {
+		return nil, err
+	}
+	return reply.GetData().(*types.SnowChoice), nil
+}

client/queueprotocol_test.go

@@ -1347,3 +1347,24 @@ func testClosePeer(t *testing.T, api client.QueueProtocolAPI) {
 	assert.Equal(t, "success", string(reply.GetMsg()))
 
 }
+
+func TestQueueProtocol_GetFinalizedBlock(t *testing.T) {
+
+	q := queue.New("test")
+
+	cli := q.Client()
+	api, err := client.New(cli, nil)
+	require.Nil(t, err)
+	defer cli.Close()
+	go func() {
+
+		cli.Sub("blockchain")
+		for msg := range cli.Recv() {
+			msg.Reply(cli.NewMessage("", 0, &types.SnowChoice{Height: 1}))
+		}
+	}()
+
+	sc, err := api.GetFinalizedBlock()
+	require.Nil(t, err)
+	require.Equal(t, 1, int(sc.GetHeight()))
+}

client/queueprotocolapi.go

@@ -148,4 +148,6 @@ type QueueProtocolAPI interface {
 	DialPeer(in *types.SetPeer) (*types.Reply, error)
 	//ClosePeer close specified peer
 	ClosePeer(in *types.SetPeer) (*types.Reply, error)
+	//GetFinalizedBlock get finalized block choice
+	GetFinalizedBlock() (*types.SnowChoice, error)
 }

rpc/grpchandler.go

@@ -594,6 +594,17 @@ func (g *Grpc) SignWalletRecoverTx(ctx context.Context, in *pb.ReqSignWalletReco
 	return g.cli.SignWalletRecoverTx(in)
 }
 
+// GetFinalizedBlock get finalized block choice
+func (g *Grpc) GetFinalizedBlock(ctx context.Context, in *pb.ReqNil) (*pb.SnowChoice, error) {
+
+	choice, err := g.cli.GetFinalizedBlock()
+	if err != nil {
+		return nil, err
+	}
+
+	return choice, nil
+}
+
 // GetChainConfig 获取chain config 参数
 func (g *Grpc) GetChainConfig(ctx context.Context, in *pb.ReqNil) (*pb.ChainConfigInfo, error) {
 	cfg := g.cli.GetConfig()

rpc/grpchandler_test.go

@@ -823,6 +823,17 @@ func TestGrpc_ConvertExectoAddr(t *testing.T) {
 	assert.Equal(t, "1GaHYpWmqAJsqRwrpoNcB8VvgKtSwjcHqt", replyStr.GetData())
 }
 
+func TestGrpc_GetFinalizedBlock(t *testing.T) {
+	g := Grpc{}
+	qapi = new(mocks.QueueProtocolAPI)
+	qapi.On("GetFinalizedBlock", mock.Anything).Return(&types.SnowChoice{Height: 1}, nil)
+	g.cli.QueueProtocolAPI = qapi
+	sc, err := g.GetFinalizedBlock(nil, nil)
+
+	require.Nil(t, err)
+	require.Equal(t, 1, int(sc.Height))
+}
+
 func TestGrpc_GetCoinSymbol(t *testing.T) {
 
 	reply, err := g.GetCoinSymbol(context.Background(), &types.ReqNil{})

rpc/jrpchandler.go

@@ -1704,3 +1704,15 @@ func (c *Chain33) ClosePeer(in *types.SetPeer, result *interface{}) error {
 	*result = &resp
 	return nil
 }
+
+// GetFinalizedBlock get finalized block choice
+func (c *Chain33) GetFinalizedBlock(in *types.ReqNil, result *interface{}) error {
+
+	choice, err := c.cli.GetFinalizedBlock()
+	if err != nil {
+		return err
+	}
+
+	*result = choice
+	return nil
+}

rpc/jrpchandler_test.go

@@ -1967,3 +1967,18 @@ func TestChain33_ClosePeer(t *testing.T) {
 	_, ok := testResult.(*rpctypes.Reply)
 	assert.True(t, ok)
 }
+
+func TestChain33_GetFinalizedBlock(t *testing.T) {
+	cfg := types.NewChain33Config(types.GetDefaultCfgstring())
+	api := new(mocks.QueueProtocolAPI)
+	api.On("GetConfig", mock.Anything).Return(cfg)
+	api.On("GetFinalizedBlock", mock.Anything).Return(&types.SnowChoice{Height: 1}, nil)
+
+	chain33 := newTestChain33(api)
+	var testResult interface{}
+	err := chain33.GetFinalizedBlock(nil, &testResult)
+	require.Nil(t, err)
+	sc, ok := testResult.(*types.SnowChoice)
+	require.True(t, ok)
+	require.Equal(t, 1, int(sc.GetHeight()))
+}

types/proto/rpc.proto

@@ -8,6 +8,7 @@ import "p2p.proto";
 import "account.proto";
 import "executor.proto";
 import "push_tx_receipt.proto";
+import "snowman.proto";
 
 package types;
 option go_package = "github.com/33cn/chain33/types";
@@ -256,6 +257,9 @@ service chain33 {
     // 钱包找回交易签名
     rpc SignWalletRecoverTx(ReqSignWalletRecoverTx) returns (ReplySignRawTx) {}
 
+    // 获取最终化区块
+    rpc GetFinalizedBlock(ReqNil) returns(snowChoice) {}
+
     // 获取节点配置信息
     rpc GetChainConfig(ReqNil) returns (ChainConfigInfo) {}