diff options
| author | Mission Liao <mission.liao@dexon.org> | 2018-12-25 10:06:35 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 7d55b28d70ee02d4af7d1ecf9e2242c70a3704df (patch) | |
| tree | 4b23a975c3f62c9891d50354fdcef1370c8015c0 /core | |
| parent | 84452cc3c776364aa948ca4bec465beae313b907 (diff) | |
| download | dexon-7d55b28d70ee02d4af7d1ecf9e2242c70a3704df.tar.gz dexon-7d55b28d70ee02d4af7d1ecf9e2242c70a3704df.tar.zst dexon-7d55b28d70ee02d4af7d1ecf9e2242c70a3704df.zip | |
vendor: sync DEXON core and fix conflicts/missings (#101)
Merging these commits in DEXON consensus core:
- https://github.com/dexon-foundation/dexon-consensus/commit/dce509a13ef5873b9cae3c1cabdb97e219b6fb7d
- https://github.com/dexon-foundation/dexon-consensus/commit/6d1c1aeea0d3e75d10cbb2712c68b4c422ba8ba6
- https://github.com/dexon-foundation/dexon-consensus/commit/c1ed57c4abaf1f4758e52f082bb7114ad00c8b39
Diffstat (limited to 'core')
| -rw-r--r-- | core/vm/governance.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/vm/governance.go b/core/vm/governance.go index 597399dd5..8be5b03b2 100644 --- a/core/vm/governance.go +++ b/core/vm/governance.go @@ -31,6 +31,8 @@ import ( coreCommon "github.com/dexon-foundation/dexon-consensus/common" "github.com/dexon-foundation/dexon-consensus/core" coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto" + coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils" + "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" @@ -2184,7 +2186,7 @@ func (g *GovernanceContract) addDKGComplaint(round *big.Int, comp []byte) ([]byt return g.penalize() } - verified, _ := core.VerifyDKGComplaintSignature(&dkgComplaint) + verified, _ := coreUtils.VerifyDKGComplaintSignature(&dkgComplaint) if !verified { return g.penalize() } @@ -2234,7 +2236,7 @@ func (g *GovernanceContract) addDKGMasterPublicKey(round *big.Int, mpk []byte) ( return g.penalize() } - verified, _ := core.VerifyDKGMasterPublicKeySignature(&dkgMasterPK) + verified, _ := coreUtils.VerifyDKGMasterPublicKeySignature(&dkgMasterPK) if !verified { return g.penalize() } @@ -2261,7 +2263,7 @@ func (g *GovernanceContract) addDKGMPKReady(round *big.Int, ready []byte) ([]byt return g.penalize() } - verified, _ := core.VerifyDKGMPKReadySignature(&dkgReady) + verified, _ := coreUtils.VerifyDKGMPKReadySignature(&dkgReady) if !verified { return g.penalize() } @@ -2290,7 +2292,7 @@ func (g *GovernanceContract) addDKGFinalize(round *big.Int, finalize []byte) ([] return g.penalize() } - verified, _ := core.VerifyDKGFinalizeSignature(&dkgFinalize) + verified, _ := coreUtils.VerifyDKGFinalizeSignature(&dkgFinalize) if !verified { return g.penalize() } |