up

cmd/parser/main.go

@@ -9,6 +9,7 @@ import (
 	"chain33-pai/pkg/util"
 	"chain33-pai/miner"
 	"chain33-pai/pkg/chain33"
+	"net/http"
 )
 
 func init() {
@@ -29,6 +30,9 @@ func init() {
 // @license.url https://chain33-pai/blob/master/LICENSE
 func main() {
 	gin.SetMode(setting.ServerSetting.RunMode)
+	go func() {
+		http.ListenAndServe("0.0.0.0:6061", nil)
+	}()
 	go miner.SyncBlock()
 	select{}
 }

miner/miner.go

@@ -71,6 +71,7 @@ func SyncBlock() {
 				checkList := make(map[int64]int64,0)
 				var wg sync.WaitGroup
 				var mutx sync.Mutex
+				logging.Info("start startHeight:",processHeight," endHeight:",processHeight+maxDownload-1)
 				for height := processHeight ;height <  processHeight + maxDownload;height ++ {
 					wg.Add(1)
 					go func(height int64) {
@@ -140,7 +141,7 @@ func SyncBlock() {
 					panic(err)
 				}
 				prev.LocalHeight += maxDownload
-				logging.Info("startHeight:",processHeight," endHeight:",processHeight+maxDownload-1)
+				logging.Info("end  startHeight:",processHeight," endHeight:",processHeight+maxDownload-1)
 			}
 
 
@@ -187,6 +188,7 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 			}
 			if rt1 != nil && rt1.Miner != ""{
 				rt.Miner = rt1.Miner
+				rt.ReturnAddr = rt1.ReturnAddr
 				rt.Amount = rt1.Amount
 				rt.Hash = rt1.Hash
 			}
@@ -218,16 +220,6 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 
 	rt.Height = block.Block.Height
 	rt.Time = block.Block.BlockTime
-	//处理交易日志
-	//for _,v := range block.Receipts {
-	//	if v.Ty == types.ExecOk {
-	//		logs := v.GetLogs()
-	//		for _, vv := range logs {
-	//
-	//		}
-	//	}
-	//
-	//}
 	raspStatList := make([]*models.RaspMinerStat,0)
 	for _,v := range rsMap {
 		raspStat := NewMinerStat(v)
@@ -238,11 +230,6 @@ func  DealBlock(height int64) ( []*models.RaspMinerStat, *models.RaspMinerTxs,er
 	raspTxs := NewMinerTxs(rt)
 
 	logging.Info("txs",*raspTxs)
-	//err = models.UpdateBlock(raspTxs,raspStat)
-	//if err != nil {
-	//	logging.Error("UpdateBlock err ",err)
-	//	return err
-	//}
 	return raspStatList,raspTxs,nil
 }