up

miner/miner.go

@@ -171,7 +171,9 @@ func (prev *prevHeight) SetMainHeight() error {
 
 func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,error) {
 	logging.Info("dealheightstart",height)
+	t1 := time.Now().Unix()
 	blocks ,err := client.GetBlocks(&types.ReqBlocks{Start:height,End:height,IsDetail:true})
+	t2 := time.Now().Unix()
 	if err != nil {
 		logging.Error("GetBlocks err",err)
 		return nil,nil,err
@@ -181,7 +183,7 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 	rt := &RMinerTxs{}
 	//处理交易数据
 	for k,v := range block.Block.Txs {
-		if block.Receipts[k].Ty == types.ExecOk {
+		if block.Receipts[k].Ty == types.ExecOk && string(v.Execer) == "ticket"{
 			rt1,rss,err := dealTx(v,block.Receipts[k],block.Block.Height,block.Block.BlockTime)
 			if err != nil {
 				logging.Error("dealTx err ",err)
@@ -218,7 +220,7 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 
 		}
 	}
-
+	t3 := time.Now().Unix()
 	rt.Height = block.Block.Height
 	rt.Time = block.Block.BlockTime
 	raspStatList := make([]*models.RaspMinerStat,0)
@@ -229,8 +231,9 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 	}
 
 	raspTxs := NewMinerTxs(rt)
-	logging.Info("dealheightend",height)
+	logging.Info("dealheightend",height,"getblock cost ",t2-t1,," dealtx cost ",t3-t2)
 	//logging.Info("txs",*raspTxs)
+
 	return raspStatList,raspTxs,nil
 }