diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-01-05 18:04:26 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-01-14 15:26:26 +0800 |
| commit | 9b93d9105164b5c64932b9e563c75bdf02ef6bd4 (patch) | |
| tree | a7d53d30cd43e515a4e106c93affc8dfd2706fea /dex | |
| parent | c8ae74af4300e1e3a817dd08fcaebfc8c9f1d661 (diff) | |
| download | dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar.gz dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar.bz2 dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar.lz dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar.xz dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.tar.zst dexon-9b93d9105164b5c64932b9e563c75bdf02ef6bd4.zip | |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/governance.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dex/governance.go b/dex/governance.go index bcc2cca51..199bcdc87 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -27,6 +27,7 @@ import ( dexCore "github.com/dexon-foundation/dexon-consensus/core" coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" + coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" "github.com/dexon-foundation/dexon/common" @@ -291,3 +292,11 @@ func (d *DexconGovernance) DKGSet(round uint64) (map[string]struct{}, error) { } return r, nil } + +func (d *DexconGovernance) ReportForkVote(vote1, vote2 *coreTypes.Vote) { + // TODO: finish this. +} + +func (d *DexconGovernance) ReportForkBlock(block1, block2 *coreTypes.Block) { + // TODO: finish this. +} |