diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:30:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:30:05 +0800 |
| commit | f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207 (patch) | |
| tree | b54c28e87d0a64cab079c08108672b8d7e39d5f2 /logger | |
| parent | 27078919669ad99bfb51b468f7c475120e6e148a (diff) | |
| parent | 6c2856df2335dec946a5ebc14a4438b261e0c881 (diff) | |
| download | dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.gz dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.bz2 dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.lz dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.xz dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.zst dexon-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.zip | |
Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs
Conflicts:
eth/block_pool.go
eth/block_pool_test.go
eth/protocol_test.go
miner/worker.go
Diffstat (limited to 'logger')
| -rw-r--r-- | logger/types.go | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/logger/types.go b/logger/types.go index 7ab4a2b8c..d98f0874a 100644 --- a/logger/types.go +++ b/logger/types.go @@ -1,6 +1,7 @@ package logger import ( + "math/big" "time" ) @@ -53,10 +54,10 @@ func (l *P2PDisconnected) EventName() string { } type EthMinerNewBlock struct { - BlockHash string `json:"block_hash"` - BlockNumber int `json:"block_number"` - ChainHeadHash string `json:"chain_head_hash"` - BlockPrevHash string `json:"block_prev_hash"` + BlockHash string `json:"block_hash"` + BlockNumber *big.Int `json:"block_number"` + ChainHeadHash string `json:"chain_head_hash"` + BlockPrevHash string `json:"block_prev_hash"` LogEvent } @@ -65,11 +66,11 @@ func (l *EthMinerNewBlock) EventName() string { } type EthChainReceivedNewBlock struct { - BlockHash string `json:"block_hash"` - BlockNumber int `json:"block_number"` - ChainHeadHash string `json:"chain_head_hash"` - BlockPrevHash string `json:"block_prev_hash"` - RemoteId int `json:"remote_id"` + BlockHash string `json:"block_hash"` + BlockNumber *big.Int `json:"block_number"` + ChainHeadHash string `json:"chain_head_hash"` + BlockPrevHash string `json:"block_prev_hash"` + RemoteId string `json:"remote_id"` LogEvent } @@ -78,10 +79,10 @@ func (l *EthChainReceivedNewBlock) EventName() string { } type EthChainNewHead struct { - BlockHash string `json:"block_hash"` - BlockNumber int `json:"block_number"` - ChainHeadHash string `json:"chain_head_hash"` - BlockPrevHash string `json:"block_prev_hash"` + BlockHash string `json:"block_hash"` + BlockNumber *big.Int `json:"block_number"` + ChainHeadHash string `json:"chain_head_hash"` + BlockPrevHash string `json:"block_prev_hash"` LogEvent } |