v2.0

Author: Da Yu

.DS_Store

@@ -1,221 +1,52 @@
-# Overview
 
-Filscan is a blockchain browser for Filecoin, which can be used to view Filecoin blockchain data, including querying addresses, messages information, block heights, miner information, token information, etc.
+# Filscan_Lotus - LotusExplorer
 
-# Table of Contents
-- [Overview](#overview)
-- [Table of Contents](#table-of-contents)
-- [Front-End](#front-end)
-  - [Recommended Browser](#recommended-browser)
-  - [User Guide](#user-guide)
-    - [Comments](#comments)
-    - [Site Map](#site-map)
-    - [Home Page](#home-page)
-    - [Tipset Page](#tipset-page)
-    - [Mining Page](#mining-page)
-    - [Token Metrics](#token-metrics)
-    - [Peer Map](#peer-map)
-  - [Install](#install)
-    - [Environmental requirements](#environmental-requirements)
-    - [Install Dependencies](#install-dependencies)
-    - [Compiles and hot-reloads for development](#compiles-and-hot-reloads-for-development)
-    - [API Environment Configuration](#api-environment-configuration)
-    - [Build](#build)
-    - [Lints and fixes files](#lints-and-fixes-files)
-    - [Customize configuration](#customize-configuration)
-- [Back-End](#back-end)
-  - [Build and Install](#build-and-install)
-    - [Environment](#environment)
-    - [System Require](#system-require)
-    - [Build](#build-1)
-    - [Configuration](#configuration)
-    - [Run](#run)
-  - [API Document](#api-document)
+## 运行
+#### 环境：
+golang >= v1.13
 
-# Front-End
+mongo >= v4.2
 
-## Recommended Browser
+系统环境 linux 或 mac 暂不支持windows
 
-For the best experience with the Filscan, we recommend that use the latest version of a browser from this list:
+一个运行完备的lotus节点
 
-•       Microsoft Edge
+以及编译lotus需要的其他依赖
 
-•       Mozilla Firefox
-
-•       Google Chrome/Chromium
-
-•       Apple Safari
-
-## User Guide
-
-### Comments
-
-**Active Miner:** the active miner is the miner that has made sector in the last 24 hours.
-
-**Active Peer:** the active peer is the node that has sent messages in the last 24 hours.
-
-### Site Map
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/site-map.png">
-</p>
-
-### Home Page
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/home-page.png">
-</p>
-
-You will get the latest chain status of Filecoin Blockchain, include the latest block&message table, the Tipset chain chart.
-
-**Search Bar:**
-
-It is convenient for users to query the blockchain data. User can query detail information about Address, Tipset Height, Block Hash, Message ID, Peer Id by search bar.
-
-**Navigation Bar:**
-
-It is an easy way to access the page you are interested in.
-
-**Chain status:**
-
-Shows the latest chain status.
-
-**The latest Blocks & Messages:**
-
-Shows the latest Blocks info & messages on chain.
-
-**BlockChain structure chart:**
-
-Shows the chain structure of the Filecoin.
-
-### Tipset Page
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/tipset-page.png">
-</p>
-
-In this page user will see the chain struct and if click the block in the tipset, the block detail info will appear.
-
-### Mining Page
-
-**Active Storage Miners:**
-
-The chart shows the count of active miners in different periods.
-
-**Evolution of Top Miners for Miners For Proven Power:**
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/mining-page.png">
-</p>
-
-The chart shows the Proven power of the top miners in different time periods.
-
-**Miner List**
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/miner-list.png">
-</p>
-
-the table shows some miner key info, some of columns can be sorted. User can choose periods to show different data.
-
-### Token Metrics
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/token-metrics.png">
-</p>
-
-The page displays the block reward and pledged amount of FIL tokens.
-
-### Peer Map
-
-<p align="center">
-  <img width="100%" style="max-width:1200px" hspace="10" border="2" src="img/peer-map.png">
-</p>
-
-This page shows the peer’s location on the map.
-
-## Install
-
-### Environmental requirements
-
-- required: Node.js(https://nodejs.org/en/)
-
-- optional : Yarn (https://yarnpkg.com/)
-
-### Install Dependencies
-```
-yarn install or npm install 
-```
-### Compiles and hot-reloads for development
-```
-yarn serve or npm run serve
-```
-### API Environment Configuration
-
-By default, the profiles are in the root directory of the project. You can modify the value of **VUE_APP_BASE_URL** to change the server address.
-
-**Example:**
-
-If you want to change the server address, you can open the file .env.development. Then you will see the default value of **VUE_APP_BASE_URL** is "http://192.168.1.2:8700/v0/filscan", modify it according to your actual server address. Please notice that you should run "yarn serve" or "npm run serve" to apply this change.
-
-### Build
-```
-yarn build:pro or npm run build:pro
-```
-### Lints and fixes files
-```
-yarn lint or npm run lint
-```
-### Customize configuration
-
-See Configuration Reference(https://cli.vuejs.org/config/).
-
-# Back-End
-
-## Build and Install
-
-### Environment
-
-- golang >= v1.13
-- mongo >= v4.2
-- lotus >= v0.2.7
-
-### System Require
-
-- Linux or Mac OS
-
-### Build
-```
+```cassandraql
 git clone (githuburl)
-
 cd Backend
-
 make build-lotus
-
-go build
+go build 
 ```
-### Configuration
+此时应生成 filscan_lotus 可执行文件
 
-Edit app.conf in path /conf and set the correct parameter
-```
-mongoHost = "127.0.0.1:27017"
+#### 配置
 
+打开 conf下app.conf文件
+```cassandraql
+mongoHost = "127.0.0.1:27017"
 mongoUser = "root"
-
 mongoPass = "admin"
+mongoDB   = "filscan"
+lotusGetWay="192.168.1.111:1234"
+```
+配置mongo服务，以及lotus节点IP(注意:lotus节点1234端口默认不对外开放需自行配置)
 
-mongoDB   = "filscan"
+#### 运行
 
-lotusGetWay="192.168.1.1:1234"
-```
-### Run
+运行目录结构
+```cassandraql
+|-- conf
+   |-- app.conf
+|-- filscan_lotus
 
-Make sure mongo and lotus is active, and run the filscan_lotus
 ```
+运行指令
+```cassandraql
 ./filscan_lotus
-```
-The application will check lotus and mongo’s status. The application will stop if got any error from them. If application start success, it will work until sync all data down from lotus. 
+``` 
 
-## API Document
+运行启动将会检查mondo以及lotus连通性。连接失败系统将终止启动。
 
-Check document [here](Filscan_Interface_v1.0.md)
+若检测成功系统将正常启动，第一启动需要同步链上数据，请耐心等待。

README.md

@@ -1,5 +1,5 @@
 appname = filscan_lotus
-httpport = 8701
+httpport = 8700
 
 listenAdd = "0.0.0.0"
 
@@ -14,6 +14,7 @@ syncChain= 10
 
 # tipset 队列cash大小
 tipsetQueueSize = 50
+tipset_cache_size = 10
 
 # LotusBaseInformation 缓存时间 s
 lotusBaseInformationCash = 5

conf/app.conf

@@ -3,7 +3,7 @@ package controllers
 import (
 	"context"
 	"crypto/md5"
-	"filscan_lotus/controllers/filscaner"
+	"filscan_lotus/filscaner"
 	"filscan_lotus/filscanproto"
 	"filscan_lotus/models"
 	"fmt"
@@ -25,8 +25,8 @@ var UserTokenMap map[string]*vcode_t
 var ps = fmt.Sprintf
 var RedisClient *redis.Client
 var SidLife int64
-var TipsetQueue *SliceEntry
-var filscanerInst *filscaner.Filscaner
+var TipsetQueue0 *SliceEntry
+var flscaner *filscaner.Filscaner
 
 var conf = beego.AppConfig.String
 var Logger *zap.SugaredLogger
@@ -36,6 +36,7 @@ var lotusBaseInformation *LotusBaseInformation
 var peerPointCash *PeerPointCash
 var avgBlockTimeCash *AvgBlockTimeCash
 var avgBlockSizeCash *AvgBlockSizeCash
+var totalPowerCash *TotalPowerCash
 
 type LotusBaseInformation struct {
 	TipsetHeight      uint64
@@ -48,6 +49,13 @@ type LotusBaseInformation struct {
 	CashTime          int64
 }
 
+type TotalPowerCash struct {
+	StorageCapacity float64
+	Data            []*filscanproto.TotalPowerGraphical
+	Time            int64
+	CashTime        int64
+}
+
 type PeerPointCash struct {
 	PeerPoint []*filscanproto.PeerPoint
 	Time      int64
@@ -73,16 +81,12 @@ type AvgBlockSizeCash struct {
 	CashTime     int64
 }
 
-type TotalPowerCash struct {
-	//BlockTime []*filscanproto.Blocktime
-	Time int64
-}
-
 type Recv struct {
 	Code int
 	Msg  string
 	Data interface{}
 }
+
 type vcode_t struct {
 	code     string
 	lasttime int64
@@ -93,16 +97,20 @@ func Firstinit() {
 	//OriginInit()
 	BeegoInit()
 	LotusInit()
-	MongoDBInit()
+	models.Db_init(beego.AppConfig)
 	models.TimenowInit()
 	LoggerInit()
-	//MysqlInit()
+	// MysqlInit()
 	ArgInit()
 	UpdatePeers()
 	UpdateAllAccount()
 	return
 }
 
+func SetFilscaner(filscaner *filscaner.Filscaner) {
+	flscaner = filscaner
+}
+
 func Run() {
 	go FirstSynLotus()
 }
@@ -160,36 +168,15 @@ func ArgInit() {
 	HomeCashTime, _ := strconv.ParseInt(homeGraphicalCash, 10, 64)
 	avgBlockTimeCash = &AvgBlockTimeCash{CashTime: HomeCashTime}
 	avgBlockSizeCash = &AvgBlockSizeCash{CashTime: HomeCashTime}
+	totalPowerCash = &TotalPowerCash{CashTime: HomeCashTime}
 
-	err, inst := filscaner.NewInstance(context.TODO(), LotusApi)
-	if err != nil {
-		panic(ps("filscaner.NewInstance fail:%v", err.Error()))
-	}
-	filscanerInst = inst
-}
-
-func MongoDBInit() {
-	host := conf("mongoHost")
-	user := conf("mongoUser")
-	pass := conf("mongoPass")
-	mongoDB := conf("mongoDB")
-	mgosession := models.GetGlobalSession(host, user, pass, mongoDB)
-	_, err := mgosession.DatabaseNames()
-	if err != nil {
-		panic(ps("mongoInit fail:%v", err))
+	if false {
+		inst, err := filscaner.NewInstance(context.TODO(), "./conf/app.conf", LotusApi)
+		if err != nil {
+			panic(ps("filscaner.NewInstance fail:%v", err.Error()))
+		}
+		flscaner = inst
 	}
-	models.DB = mongoDB
-	log("mongoInit success dbName=%v", models.DB)
-
-	models.Create_block_index()
-	models.Create_block_reward_index()
-
-	models.Create_tipset_index()
-	models.Create_peer_index()
-	models.Create_msg_index()
-	models.Create_block_index()
-	models.Create_account_index()
-	models.Create_Tipset_Rewards_Index()
 }
 
 func LotusInit() {