diff options
| author | Wei-Ning Huang <w@dexon.org> | 2019-04-03 16:43:49 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:50:06 +0800 |
| commit | 59bff3ac2672e3c30e4a3d917b9c84e35e5b6938 (patch) | |
| tree | b26a09c3d665ec6baabfe4b2a0017b48bbbc042b /dex | |
| parent | 5fae1cfd6f4575a5e6a788fb629db815995616ec (diff) | |
| download | dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar.gz dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar.bz2 dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar.lz dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar.xz dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.tar.zst dexon-59bff3ac2672e3c30e4a3d917b9c84e35e5b6938.zip | |
vendor: sync to latest core
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/blockproposer.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dex/blockproposer.go b/dex/blockproposer.go index 0b66a6cc1..8eaeb9761 100644 --- a/dex/blockproposer.go +++ b/dex/blockproposer.go @@ -121,10 +121,12 @@ func (b *blockProposer) syncConsensus() (*dexCore.Consensus, error) { atomic.StoreInt32(&b.syncing, 1) defer atomic.StoreInt32(&b.syncing, 0) + cb := b.dex.blockchain.CurrentBlock() + db := db.NewDatabase(b.dex.chainDb) privkey := coreEcdsa.NewPrivateKeyFromECDSA(b.dex.config.PrivateKey) - consensusSync := syncer.NewConsensus(b.dMoment, b.dex.app, b.dex.governance, - db, b.dex.network, privkey, log.Root()) + consensusSync := syncer.NewConsensus(cb.NumberU64(), b.dMoment, b.dex.app, + b.dex.governance, db, b.dex.network, privkey, log.Root()) // Start the watchCat. b.watchCat.Start() @@ -132,7 +134,6 @@ func (b *blockProposer) syncConsensus() (*dexCore.Consensus, error) { log.Info("Started sync watchCat") // Feed the current block we have in local blockchain. - cb := b.dex.blockchain.CurrentBlock() if cb.NumberU64() > 0 { var block coreTypes.Block if err := rlp.DecodeBytes(cb.Header().DexconMeta, &block); err != nil { |