From 6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9 Mon Sep 17 00:00:00 2001 From: Mission Liao Date: Tue, 25 Dec 2018 10:06:35 +0800 Subject: 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 --- core/vm/governance.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core') 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() } -- cgit v1.2.3