aboutsummaryrefslogtreecommitdiffstats
path: root/consensus
diff options
context:
space:
mode:
authorJhih-Ming Huang <jm.huang@cobinhood.com>2019-02-19 11:26:49 +0800
committerJhih-Ming Huang <jm.huang@cobinhood.com>2019-05-06 10:44:04 +0800
commit156e8c3e6a06a7ba3fc35ac7dd1162493090ce29 (patch)
treeb136c746d17a6ed77879bc17be7d3f8221aa6cff /consensus
parentd7ee3523a6b67a240d9f9e4924f286586c6613b2 (diff)
downloaddexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar.gz
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar.bz2
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar.lz
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar.xz
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.tar.zst
dexon-156e8c3e6a06a7ba3fc35ac7dd1162493090ce29.zip
core: rebase dev and fix lint
Diffstat (limited to 'consensus')
-rw-r--r--consensus/dexcon/fake_dexcon.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/consensus/dexcon/fake_dexcon.go b/consensus/dexcon/fake_dexcon.go
index 430d9bc6b..befda7514 100644
--- a/consensus/dexcon/fake_dexcon.go
+++ b/consensus/dexcon/fake_dexcon.go
@@ -16,7 +16,7 @@ import (
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
"github.com/dexon-foundation/dexon/core/types"
- "github.com/dexon-foundation/dexon/core/vm"
+ "github.com/dexon-foundation/dexon/core/vm/evm"
"github.com/dexon-foundation/dexon/crypto"
"github.com/dexon-foundation/dexon/rlp"
)
@@ -140,7 +140,7 @@ func (n *Node) DKGFinalize(round uint64) *coreTypesDKG.Finalize {
func (n *Node) CreateGovTx(nonce uint64, data []byte) *types.Transaction {
tx, err := types.SignTx(types.NewTransaction(
nonce,
- vm.GovernanceContractAddress,
+ evm.GovernanceContractAddress,
big.NewInt(0),
uint64(2000000),
big.NewInt(1e10),