细节完善

Author: Jason

README.md

@@ -35,9 +35,9 @@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o scan main.go
 ```
 
 ## 使用步骤
-1. 导入数据库，我用的`mariadb v10.7.3`
-    * 若扫描链交易记录，则导入`sql`目录中的`app_transaction.sql`到mysql数据库，
-    * 若使用zkf的统计和扫描，则导入`sql`目录中的`zkf.sql`到mysql数据库，
+1. 手动导入数据库，我用的`mariadb v10.7.3`
+    * 若扫描链交易记录，则导入`sql`目录中的`tx-scan.sql`到mysql数据库，
+    * 若使用zkf的统计和扫描，则导入`sql`目录中的`tx-zkf.sql`到mysql数据库，
 2. 执行上一步骤编译好的程序或者从此处下载最新已编译好的版本[evm-scan-release](https://github.com/bitxx/evm-scan/releases)（说明：配置文件中已经对各个配置做了详细描述）：
 ```shell
 # 根据配置文件描述，完成参数配置

app/app.go

@@ -115,10 +115,12 @@ func (a *App) ScanTransactionsByNumber(blockNumStart, blockNumEnd uint64) {
 					GasUsed:           tx.GasUsed,
 					TransactionIndex:  tx.TransactionIndex,
 					ReceiptStatus:     tx.ReceiptStatus,
+					Nonce:             tx.Nonce,
 					Type:              tx.Type,
 					Value:             tx.Value,
-					Protected:         protected,
-					CreatedAt:         &createTime,
+
+					Protected: protected,
+					CreatedAt: &createTime,
 				}
 				ts = append(ts, t)
 			}

app/zkf/model/zkf.go

@@ -13,8 +13,8 @@ const (
 
 type ZkfStatGas struct {
 	Id            uint64          `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
-	BlockStart    uint64          `json:"blockStart" gorm:"column:block_start;type:int(11);comment:块开始高度"`
-	BlockEnd      uint64          `json:"blockEnd" gorm:"column:block_end;type:int(11);comment:块截止高度"`
+	BlockStart    uint64          `json:"blockStart" gorm:"column:block_start;type:bigint(20);comment:块开始高度"`
+	BlockEnd      uint64          `json:"blockEnd" gorm:"column:block_end;type:bigint(20);comment:块截止高度"`
 	DateStart     *time.Time      `json:"dateStart" gorm:"column:date_start;type:datetime;comment:开始时间"`
 	DateEnd       *time.Time      `json:"dateEnd" gorm:"column:date_end;type:datetime;comment:截止时间"`
 	TotalTxCount  int64           `json:"totalTxCount" gorm:"column:total_tx_count;type:int(11);comment:交易总笔数"`

model/transaction.go

@@ -7,14 +7,15 @@ import (
 
 type Transaction struct {
 	Id                uint64          `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
-	BlockNumber       uint64          `json:"blockNumber" gorm:"column:block_number;type:int(11);comment:块高度"`
+	BlockNumber       uint64          `json:"blockNumber" gorm:"column:block_number;type:bigint(20);comment:块高度"`
 	Hash              string          `json:"hash" gorm:"column:hash;type:varchar(200);comment:hash"`
 	From              string          `json:"from" gorm:"column:from;type:varchar(80);comment:from"`
 	To                string          `json:"to" gorm:"column:to;type:varchar(80);comment:to"`
 	EffectiveGasPrice decimal.Decimal `json:"effectiveGasPrice" gorm:"column:effective_gas_price;type:decimal(30,0);comment:gas单价格"`
-	GasUsed           uint64          `json:"gasUsed" gorm:"column:gas_used;type:int(11);comment:gas used"`
+	GasUsed           uint64          `json:"gasUsed" gorm:"column:gas_used;type:bigint(20);comment:gas used"`
 	TransactionIndex  uint            `json:"transactionIndex" gorm:"column:transaction_index;type:int(11);comment:交易索引"`
-	ReceiptStatus     uint64          `json:"receiptStatus" gorm:"column:receipt_status;type:int(11);comment:交易回执状态"`
+	ReceiptStatus     uint64          `json:"receiptStatus" gorm:"column:receipt_status;type:bigint(20);comment:交易回执状态"`
+	Nonce             uint64          `json:"nonce" gorm:"column:nonce;type:bigint(20);comment:nonce"`
 	Type              string          `json:"type" gorm:"column:type;type:char(1);comment:账变类型"`
 	Value             decimal.Decimal `json:"value" gorm:"column:value;type:decimal(30,0);comment:账变数量"`
 	Protected         string          `json:"protected" gorm:"column:protected;type:char(1);comment:是否保护(1-是 2-否)"`

sql/app_transaction.sql sql/tx-scan.sqlsql/app_transaction.sql renamed to sql/tx-scan.sql

@@ -3,15 +3,15 @@
 
  Source Server         : my-server
  Source Server Type    : MySQL
- Source Server Version : 100703 (10.7.3-MariaDB-log)
+ Source Server Version : 100703
  Source Host           : 127.0.0.1:3306
  Source Schema         : evm-scan
 
  Target Server Type    : MySQL
- Target Server Version : 100703 (10.7.3-MariaDB-log)
+ Target Server Version : 100703
  File Encoding         : 65001
 
- Date: 27/02/2024 22:14:12
+ Date: 28/02/2024 09:33:22
 */
 
 SET NAMES utf8mb4;
@@ -32,6 +32,7 @@ CREATE TABLE `app_transaction` (
   `type` char(1) DEFAULT '0' COMMENT '交易类型',
   `effective_gas_price` decimal(30,0) DEFAULT 0 COMMENT 'gas price',
   `gas_used` bigint(20) DEFAULT 0 COMMENT 'gas使用',
+  `nonce` bigint(20) DEFAULT 0 COMMENT 'nonce',
   `transaction_index` int(11) DEFAULT 0 COMMENT '交易索引',
   `receipt_status` int(11) DEFAULT 0 COMMENT '回执状态',
   `created_at` datetime DEFAULT current_timestamp() COMMENT '创建时间',

sql/zkf.sql sql/zkf-scan.sqlsql/zkf.sql renamed to sql/zkf-scan.sql

@@ -3,15 +3,15 @@
 
  Source Server         : my-server
  Source Server Type    : MySQL
- Source Server Version : 100703 (10.7.3-MariaDB-log)
+ Source Server Version : 100703
  Source Host           : 127.0.0.1:3306
  Source Schema         : evm-scan
 
  Target Server Type    : MySQL
- Target Server Version : 100703 (10.7.3-MariaDB-log)
+ Target Server Version : 100703
  File Encoding         : 65001
 
- Date: 27/02/2024 22:38:30
+ Date: 28/02/2024 09:30:30
 */
 
 SET NAMES utf8mb4;
@@ -34,7 +34,7 @@ CREATE TABLE `app_zkf_stat_daily_gas` (
   `updated_at` datetime DEFAULT current_timestamp() COMMENT '更新时间',
   `created_at` datetime DEFAULT current_timestamp() COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='zkf统计每周Gas';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='zkf统计每日Gas';
 
 -- ----------------------------
 -- Table structure for app_zkf_stat_hours_gas
@@ -53,7 +53,7 @@ CREATE TABLE `app_zkf_stat_hours_gas` (
   `updated_at` datetime DEFAULT current_timestamp() COMMENT '更新时间',
   `created_at` datetime DEFAULT current_timestamp() COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='zkf统计每周Gas';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='zkf统计每小时Gas';
 
 -- ----------------------------
 -- Table structure for app_zkf_stat_weekly_gas