From dda1d605565caad90597fd7d0e5126838cef3e9c Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 25 Mar 2015 09:58:46 +0100 Subject: Store protocol version in the block db **NOT** extra db --- eth/backend.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'eth/backend.go') diff --git a/eth/backend.go b/eth/backend.go index 3f7f7c2cb..3fa10086a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -167,13 +167,13 @@ func New(config *Config) (*Ethereum, error) { extraDb, err := ethdb.NewLDBDatabase(path.Join(config.DataDir, "extra")) // Perform database sanity checks - d, _ := extraDb.Get([]byte("ProtocolVersion")) + d, _ := blockDb.Get([]byte("ProtocolVersion")) protov := int(common.NewValue(d).Uint()) if protov != config.ProtocolVersion && protov != 0 { path := path.Join(config.DataDir, "blockchain") return nil, fmt.Errorf("Database version mismatch. Protocol(%d / %d). `rm -rf %s`", protov, config.ProtocolVersion, path) } - saveProtocolVersion(extraDb, config.ProtocolVersion) + saveProtocolVersion(blockDb, config.ProtocolVersion) servlogger.Infof("Protocol Version: %v, Network Id: %v", config.ProtocolVersion, config.NetworkId) eth := &Ethereum{ -- cgit