diff options
| author | gary rong <garyrong0905@gmail.com> | 2019-02-21 21:14:35 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2019-02-21 21:14:35 +0800 |
| commit | 7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a (patch) | |
| tree | a6eb7b42652916da18091879974f0f513dd19e3d /eth | |
| parent | 8577b5b020d963ef9972981bbfc62b8930d3e9c9 (diff) | |
| download | go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar.gz go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar.bz2 go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar.lz go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar.xz go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.tar.zst go-tangerine-7fd0ccaa68cbc8e3f4fc59d3b99ba5067ba7c73a.zip | |
core: remove unnecessary fields in logs, receipts and tx lookups (#17106)
* core: remove unnecessary fields in log
* core: bump blockchain database version
* core, les: remove unnecessary fields in txlookup
* eth: print db version explicitly
* core/rawdb: drop txlookup entry struct wrapper
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/eth/backend.go b/eth/backend.go index 6a136182a..6710e4513 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -145,16 +145,20 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks, params.BloomConfirms), } - log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId) + bcVersion := rawdb.ReadDatabaseVersion(chainDb) + var dbVer = "<nil>" + if bcVersion != nil { + dbVer = fmt.Sprintf("%d", *bcVersion) + } + log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId, "dbversion", dbVer) if !config.SkipBcVersionCheck { - bcVersion := rawdb.ReadDatabaseVersion(chainDb) if bcVersion != nil && *bcVersion > core.BlockChainVersion { return nil, fmt.Errorf("database version is v%d, Geth %s only supports v%d", *bcVersion, params.VersionWithMeta, core.BlockChainVersion) - } else if bcVersion != nil && *bcVersion < core.BlockChainVersion { - log.Warn("Upgrade blockchain database version", "from", *bcVersion, "to", core.BlockChainVersion) + } else if bcVersion == nil || *bcVersion < core.BlockChainVersion { + log.Warn("Upgrade blockchain database version", "from", dbVer, "to", core.BlockChainVersion) + rawdb.WriteDatabaseVersion(chainDb, core.BlockChainVersion) } - rawdb.WriteDatabaseVersion(chainDb, core.BlockChainVersion) } var ( vmConfig = vm.Config{ |