From 70ab62c1b72c6fef8dd2c8e405d7f9823f70f475 Mon Sep 17 00:00:00 2001 From: Mission Liao Date: Tue, 18 Dec 2018 10:02:30 +0800 Subject: vendor: sync to latest core (#91) - Implement new methods in db to cache DKG private key. - Implement new methods in db to cache compaction chain tip. --- dex/backend.go | 4 +- dex/blockdb/db.go | 71 ------------------------------------ dex/db/db.go | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dex/handler.go | 4 +- 4 files changed, 111 insertions(+), 75 deletions(-) delete mode 100644 dex/blockdb/db.go create mode 100644 dex/db/db.go (limited to 'dex') diff --git a/dex/backend.go b/dex/backend.go index 5ea30b1a9..2c87425de 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -31,7 +31,7 @@ import ( "github.com/dexon-foundation/dexon/core/bloombits" "github.com/dexon-foundation/dexon/core/rawdb" "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/dex/blockdb" + dexDB "github.com/dexon-foundation/dexon/dex/db" "github.com/dexon-foundation/dexon/dex/downloader" "github.com/dexon-foundation/dexon/eth/filters" "github.com/dexon-foundation/dexon/eth/gasprice" @@ -170,7 +170,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { log.Info("DEXON Consensus DMoment", "time", dMoment) dex.consensus = dexCore.NewConsensus(dMoment, - dex.app, dex.governance, blockdb.NewDatabase(chainDb), dex.network, privKey, log.Root()) + dex.app, dex.governance, dexDB.NewDatabase(chainDb), dex.network, privKey, log.Root()) return dex, nil } diff --git a/dex/blockdb/db.go b/dex/blockdb/db.go deleted file mode 100644 index 4f08a3edd..000000000 --- a/dex/blockdb/db.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2018 The dexon-consensus Authors -// This file is part of the dexon-consensus library. -// -// The dexon-consensus library is free software: you can redistribute it -// and/or modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 of the License, -// or (at your option) any later version. -// -// The dexon-consensus library is distributed in the hope that it will be -// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser -// General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with the dexon-consensus library. If not, see -// . - -package blockdb - -import ( - coreCommon "github.com/dexon-foundation/dexon-consensus/common" - coreDb "github.com/dexon-foundation/dexon-consensus/core/db" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/ethdb" -) - -// BlockDB implement dexon-consensus BlockDatabase interface. -type BlockDB struct { - db ethdb.Database -} - -func NewDatabase(db ethdb.Database) *BlockDB { - return &BlockDB{db} -} - -func (d *BlockDB) HasBlock(hash coreCommon.Hash) bool { - return rawdb.HasCoreBlock(d.db, common.Hash(hash)) -} - -func (d *BlockDB) GetBlock(hash coreCommon.Hash) (coreTypes.Block, error) { - block := rawdb.ReadCoreBlock(d.db, common.Hash(hash)) - if block == nil { - return coreTypes.Block{}, coreDb.ErrBlockDoesNotExist - } - return *block, nil -} - -func (d *BlockDB) GetAllBlocks() (coreDb.BlockIterator, error) { - return nil, coreDb.ErrNotImplemented -} - -func (d *BlockDB) UpdateBlock(block coreTypes.Block) error { - if !d.HasBlock(block.Hash) { - return coreDb.ErrBlockDoesNotExist - } - rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block) - return nil -} - -func (d *BlockDB) PutBlock(block coreTypes.Block) error { - if d.HasBlock(block.Hash) { - return coreDb.ErrBlockExists - } - rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block) - return nil -} - -func (d *BlockDB) Close() error { return nil } diff --git a/dex/db/db.go b/dex/db/db.go new file mode 100644 index 000000000..d51c2df54 --- /dev/null +++ b/dex/db/db.go @@ -0,0 +1,107 @@ +// Copyright 2018 The dexon-consensus Authors +// This file is part of the dexon-consensus library. +// +// The dexon-consensus library is free software: you can redistribute it +// and/or modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the License, +// or (at your option) any later version. +// +// The dexon-consensus library is distributed in the hope that it will be +// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +// General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the dexon-consensus library. If not, see +// . + +package db + +import ( + coreCommon "github.com/dexon-foundation/dexon-consensus/common" + coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg" + coreDb "github.com/dexon-foundation/dexon-consensus/core/db" + coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" + + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/core/rawdb" + "github.com/dexon-foundation/dexon/ethdb" +) + +// DB implement dexon-consensus BlockDatabase interface. +type DB struct { + db ethdb.Database +} + +func NewDatabase(db ethdb.Database) *DB { + return &DB{db} +} + +func (d *DB) HasBlock(hash coreCommon.Hash) bool { + return rawdb.HasCoreBlock(d.db, common.Hash(hash)) +} + +func (d *DB) GetBlock(hash coreCommon.Hash) (coreTypes.Block, error) { + block := rawdb.ReadCoreBlock(d.db, common.Hash(hash)) + if block == nil { + return coreTypes.Block{}, coreDb.ErrBlockDoesNotExist + } + return *block, nil +} + +func (d *DB) GetAllBlocks() (coreDb.BlockIterator, error) { + return nil, coreDb.ErrNotImplemented +} + +func (d *DB) UpdateBlock(block coreTypes.Block) error { + if !d.HasBlock(block.Hash) { + return coreDb.ErrBlockDoesNotExist + } + rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block) + return nil +} + +func (d *DB) PutBlock(block coreTypes.Block) error { + if d.HasBlock(block.Hash) { + return coreDb.ErrBlockExists + } + rawdb.WriteCoreBlock(d.db, common.Hash(block.Hash), &block) + return nil +} + +func (d *DB) HasDKGPrivateKey(round uint64) (bool, error) { + return rawdb.HasCoreDKGPrivateKey(d.db, round) +} + +func (d *DB) GetDKGPrivateKey(round uint64) (coreDKG.PrivateKey, error) { + key := rawdb.ReadCoreDKGPrivateKey(d.db, round) + if key == nil { + return coreDKG.PrivateKey{}, coreDb.ErrDKGPrivateKeyDoesNotExist + } + return *key, nil +} + +func (d *DB) PutDKGPrivateKey(round uint64, key coreDKG.PrivateKey) error { + has, err := d.HasDKGPrivateKey(round) + if err != nil { + return err + } + if has { + return coreDb.ErrDKGPrivateKeyExists + } + return rawdb.WriteCoreDKGPrivateKey(d.db, round, &key) +} + +func (d *DB) PutCompactionChainTipInfo(hash coreCommon.Hash, height uint64) error { + _, currentHeight := d.GetCompactionChainTipInfo() + if height <= currentHeight { + return coreDb.ErrInvalidCompactionChainTipHeight + } + return rawdb.WriteCoreCompactionChainTip(d.db, hash, height) +} + +func (d *DB) GetCompactionChainTipInfo() (hash coreCommon.Hash, height uint64) { + return rawdb.ReadCoreCompactionChainTip(d.db) +} + +func (d *DB) Close() error { return nil } diff --git a/dex/handler.go b/dex/handler.go index 620320f49..9174d8516 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -53,7 +53,7 @@ import ( "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/types" "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dex/blockdb" + dexDB "github.com/dexon-foundation/dexon/dex/db" "github.com/dexon-foundation/dexon/dex/downloader" "github.com/dexon-foundation/dexon/dex/fetcher" "github.com/dexon-foundation/dexon/ethdb" @@ -158,7 +158,7 @@ func NewProtocolManager( nodeTable: tab, gov: gov, blockchain: blockchain, - cache: newCache(5120, blockdb.NewDatabase(chaindb)), + cache: newCache(5120, dexDB.NewDatabase(chaindb)), chainconfig: config, newPeerCh: make(chan *peer), noMorePeers: make(chan struct{}), -- cgit v1.2.3